From: David S. Miller <davem@davemloft.net>
Date: Tue, 15 Feb 2011 20:18:09 +0000 (-0800)
Subject: isdn: hisax: Use l2headersize() instead of dup (and buggy) func.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6d90e8f45697c633f522269368297d7416fd8783;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

isdn: hisax: Use l2headersize() instead of dup (and buggy) func.

There was a bug in my commit c978e7bb77dfd2cd3d1f547fa4e395cfe47f02b2
("hisax: Fix unchecked alloc_skb() return.")

One of the l2->flag checks is wrong.

Even worse it turns out I'm duplicating an existing function,
so use that instead.

Reported-by: Milton Miller <miltonm@bga.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/isdn/hisax/isdnl2.c b/drivers/isdn/hisax/isdnl2.c
index 98ac835281fe..cfff0c41d298 100644
--- a/drivers/isdn/hisax/isdnl2.c
+++ b/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;