From be750faf3fae2966e132ca73a418245f095aee22 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 15 Feb 2011 12:18:09 -0800
Subject: [PATCH] --- yaml --- r: 233444 b: refs/heads/master c:
 6d90e8f45697c633f522269368297d7416fd8783 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 56fd70934d5f..0b1d4113e0fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d11327ad6695db8117c78d70611e71102ceec2ac
+refs/heads/master: 6d90e8f45697c633f522269368297d7416fd8783
diff --git a/trunk/drivers/isdn/hisax/isdnl2.c b/trunk/drivers/isdn/hisax/isdnl2.c
index 98ac835281fe..cfff0c41d298 100644
--- a/trunk/drivers/isdn/hisax/isdnl2.c
+++ b/trunk/drivers/isdn/hisax/isdnl2.c
@@ -1243,13 +1243,6 @@ l2_st7_tout_203(struct FsmInst *fi, int event, void *arg)
 	st->l2.rc = 0;
 }
 
-static int l2_hdr_space_needed(struct Layer2 *l2)
-{
-	int len = test_bit(FLG_LAPD, &l2->flag) ? 2 : 1;
-
-	return len + (test_bit(FLG_LAPD, &l2->flag) ? 2 : 1);
-}
-
 static void
 l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)
 {
@@ -1268,7 +1261,7 @@ l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)
 	if (!skb)
 		return;
 
-	hdr_space_needed = l2_hdr_space_needed(l2);
+	hdr_space_needed = l2headersize(l2, 0);
 	if (hdr_space_needed > skb_headroom(skb)) {
 		struct sk_buff *orig_skb = skb;