Commit 6d90e8f4 authored by David S. Miller's avatar David S. Miller

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

There was a bug in my commit c978e7bb
("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: default avatarMilton Miller <miltonm@bga.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d11327ad
...@@ -1243,13 +1243,6 @@ l2_st7_tout_203(struct FsmInst *fi, int event, void *arg) ...@@ -1243,13 +1243,6 @@ l2_st7_tout_203(struct FsmInst *fi, int event, void *arg)
st->l2.rc = 0; 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 static void
l2_pull_iqueue(struct FsmInst *fi, int event, void *arg) l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)
{ {
...@@ -1268,7 +1261,7 @@ 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) if (!skb)
return; return;
hdr_space_needed = l2_hdr_space_needed(l2); hdr_space_needed = l2headersize(l2, 0);
if (hdr_space_needed > skb_headroom(skb)) { if (hdr_space_needed > skb_headroom(skb)) {
struct sk_buff *orig_skb = skb; struct sk_buff *orig_skb = skb;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment