---

yaml
---
r: 227910
b: refs/heads/master
c: 7441698
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ba8fe77ddd3a25daa8409333295b90c26a43bae
+refs/heads/master: 7441698fe9eb0eb473cf1699d9cd8dd06dfeaf77

trunk/drivers/staging/bcm/Bcmnet.c

@@ -124,6 +124,9 @@ int register_networkdev(PMINI_ADAPTER Adapter)
 	net->ethtool_ops = &bcm_ethtool_ops;
 	net->mtu          = MTU_SIZE; /* 1400 Bytes */
 	net->tx_queue_len = TX_QLEN;
+	net->flags |= IFF_NOARP;
+	net->flags &= ~(IFF_BROADCAST|IFF_MULTICAST);
+
 	netif_carrier_off(net);
 
 	SET_NETDEV_DEVTYPE(net, &wimax_type);

trunk/drivers/staging/bcm/Makefile

@@ -6,7 +6,7 @@ obj-$(CONFIG_BCM_WIMAX) +=	bcm_wimax.o
 
 bcm_wimax-y :=  InterfaceDld.o InterfaceIdleMode.o InterfaceInit.o InterfaceRx.o \
 		InterfaceIsr.o InterfaceMisc.o InterfaceTx.o \
-		Arp.o CmHost.o IPv6Protocol.o Qos.o Transmit.o\
+		CmHost.o IPv6Protocol.o Qos.o Transmit.o\
 		Bcmnet.o DDRInit.o HandleControlPacket.o\
 		LeakyBucket.o Misc.o sort.o Bcmchar.o hostmibs.o PHSModule.o\
 		led_control.o nvm.o vendorspecificextn.o

trunk/drivers/staging/bcm/Transmit.c

@@ -6,7 +6,7 @@
 digraph transmit1 {
 node[shape=box]
 edge[weight=5;color=red]
-bcm_transmit->reply_to_arp_request[label="ARP"]
+
 bcm_transmit->GetPacketQueueIndex[label="IP Packet"]
 GetPacketQueueIndex->IpVersion4[label="IPV4"]
 GetPacketQueueIndex->IpVersion6[label="IPV6"]
@@ -63,17 +63,8 @@ netdev_tx_t bcm_transmit(struct sk_buff *skb, struct net_device *dev)
 
 	qindex = GetPacketQueueIndex(Adapter, skb);
 
-	if (INVALID_QUEUE_INDEX==qindex)	{
-		if (ntohs(eth_hdr(skb)->h_proto) != ETH_ARP_FRAME)
-			goto drop;
-
-		/*
-		  Reply directly to ARP request packet
-		  ARP Spoofing only if NO ETH CS rule matches for it
-		*/
-		reply_to_arp_request(skb);
-		return NETDEV_TX_OK;
-	}
+	if (INVALID_QUEUE_INDEX==qindex)
+		goto drop;
 
 	if (Adapter->PackInfo[qindex].uiCurrentPacketsOnHost >= SF_MAX_ALLOWED_PACKETS_TO_BACKUP)
 		return NETDEV_TX_BUSY;