diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-04-27 19:16:19 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-04-27 19:16:19 +0100 |
| commit | d1da4e50e5d09f02c340927a4fcb7f54202fa033 (patch) | |
| tree | 7f98317bdd45dbdb7644e9179891c5af6a3a8ef1 /drivers/net/wan/sealevel.c | |
| parent | 78ab67da1002d954ea4c3e2b441e2483c41f94e8 (diff) | |
| parent | a205752d1ad2d37d6597aaae5a56fc396a770868 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/Kconfig
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/net/wan/sealevel.c')
| -rw-r--r-- | drivers/net/wan/sealevel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c index 70fb1b98b1dd..131358108c5a 100644 --- a/drivers/net/wan/sealevel.c +++ b/drivers/net/wan/sealevel.c @@ -61,7 +61,7 @@ static void sealevel_input(struct z8530_channel *c, struct sk_buff *skb) /* Drop the CRC - it's not a good idea to try and negotiate it ;) */ skb_trim(skb, skb->len-2); skb->protocol=htons(ETH_P_WAN_PPP); - skb->mac.raw=skb->data; + skb_reset_mac_header(skb); skb->dev=c->netdevice; /* * Send it to the PPP layer. We don't have time to process |