[commits] batman-adv; branch, master, updated. v2010.1.0-158-ge704b9c

postmaster at open-mesh.net postmaster at open-mesh.net
Sun Sep 12 17:53:20 CEST 2010


The following commit has been merged in the master branch:
commit e704b9c52a49d4bc745c730e8e4a9614ed014c54
Author: Marek Lindner <lindner_marek at yahoo.de>
Date:   Sun Sep 12 15:53:02 2010 +0000

    batman-adv: removing redundant assignment of skb->dev
    
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>

diff --git a/soft-interface.c b/soft-interface.c
index 853bfc8..2a84d3b 100644
--- a/soft-interface.c
+++ b/soft-interface.c
@@ -211,7 +211,7 @@ void interface_rx(struct net_device *soft_iface,
 	skb_pull_rcsum(skb, hdr_size);
 /*	skb_set_mac_header(skb, -sizeof(struct ethhdr));*/
 
-	skb->dev = soft_iface;
+	/* skb->dev & skb->pkt_type are set here */
 	skb->protocol = eth_type_trans(skb, soft_iface);
 
 	/* should not be neccesary anymore as we use skb_pull_rcsum()
@@ -220,9 +220,6 @@ void interface_rx(struct net_device *soft_iface,
 
 /*	skb->ip_summed = CHECKSUM_UNNECESSARY;*/
 
-	/* TODO: set skb->pkt_type to PACKET_BROADCAST, PACKET_MULTICAST,
-	 * PACKET_OTHERHOST or PACKET_HOST */
-
 	priv->stats.rx_packets++;
 	priv->stats.rx_bytes += skb->len + sizeof(struct ethhdr);
 

-- 
batman-adv


More information about the commits mailing list