diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-11 04:29:48 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-11 04:29:48 -0400 |
| commit | 29d8699ebb1e8948a612306c69e6d9c4ef23342f (patch) | |
| tree | f2378e8d2fbef7fc215a25acf2042b8965109e5e /net/ax25/ax25_in.c | |
| parent | e9438250b635f7832e99a8c8d2e394dd1522ce65 (diff) | |
| parent | 907a42617970a159361f17ef9a63f04d276995ab (diff) | |
Merge branch 'master' of /usr/src/ntfs-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 810c9c76c2e0..73cfc3411c46 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) | |||
| 123 | } | 123 | } |
| 124 | 124 | ||
| 125 | skb_pull(skb, 1); /* Remove PID */ | 125 | skb_pull(skb, 1); /* Remove PID */ |
| 126 | skb->h.raw = skb->data; | 126 | skb->mac.raw = skb->nh.raw; |
| 127 | skb->nh.raw = skb->data; | 127 | skb->nh.raw = skb->data; |
| 128 | skb->dev = ax25->ax25_dev->dev; | 128 | skb->dev = ax25->ax25_dev->dev; |
| 129 | skb->pkt_type = PACKET_HOST; | 129 | skb->pkt_type = PACKET_HOST; |