patch-2.4.2 linux/net/ax25/ax25_in.c
Next file: linux/net/ax25/sysctl_net_ax25.c
Previous file: linux/net/ax25/af_ax25.c
Back to the patch index
Back to the overall index
- Lines: 32
- Date:
Fri Feb 9 11:30:57 2001
- Orig file:
v2.4.1/linux/net/ax25/ax25_in.c
- Orig date:
Fri Dec 29 14:35:47 2000
diff -u --recursive --new-file v2.4.1/linux/net/ax25/ax25_in.c linux/net/ax25/ax25_in.c
@@ -36,6 +36,7 @@
* AX.25 036 Jonathan(G4KLX) Move DAMA code into own file.
* Joerg(DL1BKE) Fixed DAMA Slave.
* AX.25 037 Jonathan(G4KLX) New timer architecture.
+ * Thomas(DL9SAU) Fixed missing initialization of skb->protocol.
*/
#include <linux/config.h>
@@ -158,6 +159,7 @@
skb->nh.raw = skb->data;
skb->dev = ax25->ax25_dev->dev;
skb->pkt_type = PACKET_HOST;
+ skb->protocol = htons(ETH_P_IP);
ip_rcv(skb, skb->dev, NULL); /* Wrong ptype */
return 1;
}
@@ -287,6 +289,7 @@
skb->nh.raw = skb->data;
skb->dev = dev;
skb->pkt_type = PACKET_HOST;
+ skb->protocol = htons(ETH_P_IP);
ip_rcv(skb, dev, ptype); /* Note ptype here is the wrong one, fix me later */
break;
@@ -296,6 +299,7 @@
skb->nh.raw = skb->data;
skb->dev = dev;
skb->pkt_type = PACKET_HOST;
+ skb->protocol = htons(ETH_P_ARP);
arp_rcv(skb, dev, ptype); /* Note ptype here is wrong... */
break;
#endif
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)