summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-02-09 00:46:47 +0000
committerDavid S. Miller <davem@davemloft.net>2012-02-09 15:41:29 -0500
commit5a46e0f95664bb65e3256f3c53b14b8a627c656b (patch)
tree40af93d61166e8beaa8ba4271aee9ce1e4d116c6
parent16bda13d90c8d5da243e2cfa1677e62ecce26860 (diff)
downloadlinux-5a46e0f95664bb65e3256f3c53b14b8a627c656b.tar.gz
linux-5a46e0f95664bb65e3256f3c53b14b8a627c656b.tar.bz2
linux-5a46e0f95664bb65e3256f3c53b14b8a627c656b.zip
isdn: type bug in isdn_net_header()
We use len to store the return value from eth_header(). eth_header() can return -ETH_HLEN (-14). We want to pass this back instead of truncating it to 65522 and returning that. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/isdn/i4l/isdn_net.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index 2339d7396b9e..802ab87a78b6 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -1901,7 +1901,7 @@ static int isdn_net_header(struct sk_buff *skb, struct net_device *dev,
{
isdn_net_local *lp = netdev_priv(dev);
unsigned char *p;
- ushort len = 0;
+ int len = 0;
switch (lp->p_encap) {
case ISDN_NET_ENCAP_ETHER: