diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 10:33:02 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 10:33:02 -0400 |
| commit | 9dc263239bb2cfeb242d8ef758fca66a968822d5 (patch) | |
| tree | 70c0c46fa6f01740c776ae24bc0874a8d97df222 /net/ax25/ax25_in.c | |
| parent | 0e5dec478cfff2c29e68d1108ff828fa321adc59 (diff) | |
| parent | 829841146878e082613a49581ae252c071057c23 (diff) | |
Merge branch 'master'
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; |