patch-2.4.22 linux-2.4.22/net/ipv4/ip_output.c

Next file: linux-2.4.22/net/ipv4/ip_sockglue.c
Previous file: linux-2.4.22/net/ipv4/ip_gre.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.21/net/ipv4/ip_output.c linux-2.4.22/net/ipv4/ip_output.c
@@ -167,8 +167,11 @@
 #endif /*CONFIG_NETFILTER_DEBUG*/
 
 	if (hh) {
+		int hh_alen;
+
 		read_lock_bh(&hh->hh_lock);
-  		memcpy(skb->data - 16, hh->hh_data, 16);
+		hh_alen = HH_DATA_ALIGN(hh->hh_len);
+  		memcpy(skb->data - hh_alen, hh->hh_data, hh_alen);
 		read_unlock_bh(&hh->hh_lock);
 	        skb_push(skb, hh->hh_len);
 		return hh->hh_output(skb);
@@ -1021,4 +1024,5 @@
 #ifdef CONFIG_IP_MULTICAST
 	proc_net_create("igmp", 0, ip_mc_procinfo);
 #endif
+	proc_net_create("mcfilter", 0, ip_mcf_procinfo);
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)