bcmdhd: change packet filter settings to block multicast

Conflicts: drivers/net/wireless/bcmdhd/src/dhd/sys/dhd_linux.c
ougdata · Sep 4, 2012 · b0a3f7d · b0a3f7d
1 parent 26e2362
commit b0a3f7d
Showing 1 changed file with 0 additions and 33 deletions.
diff --git a/drivers/net/wireless/bcmdhd/src/dhd/sys/dhd_linux.c b/drivers/net/wireless/bcmdhd/src/dhd/sys/dhd_linux.c
@@ -3778,7 +3778,6 @@ dhd_preinit_ioctls(dhd_pub_t *dhd)
 #ifdef PKT_FILTER_SUPPORT
 	/* Setup defintions for pktfilter , enable in suspend */
 	dhd->pktfilter_count = 1;
-	/* Setup filter to allow unicast only */
 	dhd->pktfilter[0] = "100 0 0 0 0x01 0x00";
 
 #if defined(SOFTAP)
@@ -4986,39 +4985,7 @@ int net_os_set_dtim_skip(struct net_device *dev, int val)
 
 int net_os_rxfilter_add_remove(struct net_device *dev, int add_remove, int num)
 {
-#ifndef GAN_LITE_NAT_KEEPALIVE_FILTER
-	dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(dev);
-	char *filterp = NULL;
-	int ret = 0;
-
-	if (!dhd || (num == DHD_UNICAST_FILTER_NUM))
-		return ret;
-	if (num >= dhd->pub.pktfilter_count)
-		return -EINVAL;
-	if (add_remove) {
-		switch (num) {
-		case DHD_BROADCAST_FILTER_NUM:
-			filterp = "101 0 0 0 0xFFFFFFFFFFFF 0xFFFFFFFFFFFF";
-			break;
-		case DHD_MULTICAST4_FILTER_NUM:
-			filterp = "102 0 0 0 0xFFFFFF 0x01005E";
-			break;
-		case DHD_MULTICAST6_FILTER_NUM:
-#if defined(CUSTOMER_HW_SAMSUNG)
-/* customer want to use NO IPV6 packets only */
-			return ret;
-#endif
-			filterp = "103 0 0 0 0xFFFF 0x3333";
-			break;
-		default:
-			return -EINVAL;
-		}
-	}
-	dhd->pub.pktfilter[num] = filterp;
-	return ret;
-#else
 	return 0;
-#endif /* GAN_LITE_NAT_KEEPALIVE_FILTER */
 }
 
 int net_os_set_packet_filter(struct net_device *dev, int val)