---

yaml --- r: 233444 b: refs/heads/master c: 6d90e8f h: refs/heads/master v: v3
git-mirror · Feb 15, 2011 · be750fa · be750fa
1 parent 5671f79
commit be750fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git 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
@@ -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;