The following commit has been merged in the next branch: commit c0b0f402ea3a899561a174f0551dd669ab55c85f Author: Marek Lindner lindner_marek@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@yahoo.de

diff --git a/soft-interface.c b/soft-interface.c index f6606ea..df0e468 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -202,7 +202,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() @@ -211,9 +211,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);