diff --git a/[refs] b/[refs]
index b493411d72ac..0c3ca90fdd1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 368b4f06c8809b72df9e46af90dcd9aaf5daafc3
+refs/heads/master: b001f71ed1ea728814175b711602e150826d13cc
diff --git a/trunk/drivers/staging/batman-adv/soft-interface.c b/trunk/drivers/staging/batman-adv/soft-interface.c
index 8d1434351918..3904db9ce7b1 100644
--- a/trunk/drivers/staging/batman-adv/soft-interface.c
+++ b/trunk/drivers/staging/batman-adv/soft-interface.c
@@ -201,7 +201,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()
@@ -210,9 +210,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);