diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-18 13:50:52 -0700 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-18 13:50:52 -0700 |
| commit | cff6bf970965c98c62007fc8a36527fd147fe233 (patch) | |
| tree | 2791f2208b54ade86625af416ff5342f11282f0c /net/ax25/ax25_in.c | |
| parent | 6cd7525a00f3b926e8bd2e402954ed3e09a8e924 (diff) | |
| parent | 39ca371c45b04cd50d0974030ae051906fc516b6 (diff) | |
| download | op-kernel-dev-cff6bf970965c98c62007fc8a36527fd147fe233.zip op-kernel-dev-cff6bf970965c98c62007fc8a36527fd147fe233.tar.gz | |
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/ax25/ax25_in.c')
| -rw-r--r-- | net/ax25/ax25_in.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c index 810c9c7..73cfc34 100644 --- a/net/ax25/ax25_in.c +++ b/net/ax25/ax25_in.c @@ -123,7 +123,7 @@ int ax25_rx_iframe(ax25_cb *ax25, struct sk_buff *skb) } skb_pull(skb, 1); /* Remove PID */ - skb->h.raw = skb->data; + skb->mac.raw = skb->nh.raw; skb->nh.raw = skb->data; skb->dev = ax25->ax25_dev->dev; skb->pkt_type = PACKET_HOST; |
