From 7eb8ab0f4990813e256ffbd748003c353db0e1c3 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 9 Feb 2012 00:46:47 +0000
Subject: [PATCH] --- yaml --- r: 287541 b: refs/heads/master c:
 5a46e0f95664bb65e3256f3c53b14b8a627c656b h: refs/heads/master i:   287539:
 3ef46818e18434d9ef21cc1c810f1c1c9205c83f v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/isdn/i4l/isdn_net.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8632758eb854..6701bfd752aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16bda13d90c8d5da243e2cfa1677e62ecce26860
+refs/heads/master: 5a46e0f95664bb65e3256f3c53b14b8a627c656b
diff --git a/trunk/drivers/isdn/i4l/isdn_net.c b/trunk/drivers/isdn/i4l/isdn_net.c
index 2339d7396b9e..802ab87a78b6 100644
--- a/trunk/drivers/isdn/i4l/isdn_net.c
+++ b/trunk/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: