patch-2.1.16 linux/net/bridge/br.c

Next file: linux/net/core/dev.c
Previous file: linux/net/ax25/ax25_subr.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.15/linux/net/bridge/br.c linux/net/bridge/br.c
@@ -980,7 +980,7 @@
 			skb->h.eth->h_dest[3],
 			skb->h.eth->h_dest[4],
 			skb->h.eth->h_dest[5]);
-	skb->h.eth->h_proto = htonl(0x8038);	/* XXX verify */
+	skb->h.eth->h_proto = htons(0x8038);
 
 	skb->h.raw += skb->dev->hard_header_len;
 	memcpy(skb->h.raw, config_bpdu, sizeof(Config_bpdu));
@@ -1036,12 +1036,12 @@
 			skb->h.eth->h_dest[3],
 			skb->h.eth->h_dest[4],
 			skb->h.eth->h_dest[5]);
-	skb->h.eth->h_proto = 0x8038;	/* XXX verify */
+	skb->h.eth->h_proto = htons(0x8038);
 
 	skb->h.raw += skb->dev->hard_header_len;
 	memcpy(skb->h.raw, bpdu, sizeof(Tcn_bpdu));
 
-	/* mark that's we've been here... */
+	/* mark that we've been here... */
 	skb->pkt_bridged = IS_BRIDGED;
 	skb->arp = 1;	/* do not resolve... */
 	skb->h.raw = skb->data + ETH_HLEN;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov