Revert "Driver: net: r8169: Work around for cardhu dock (HACK)"
Mursalin Akon [Mon, 9 Jan 2012 19:49:57 +0000 (11:49 -0800)]
As we can program the Ethernet EEPROM, we do not need
the NVIDIA hack anymore.

This reverts commit a87ed2225d0367835c6ba0ad880f7b1049deaaa2.

Bug 923832

Change-Id: I157315f65a9eb2df964dd07431ce52cc08adca6c
Signed-off-by: Mursalin Akon <makon@nvidia.com>
Reviewed-on: http://git-master/r/74074
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Eric Brower <ebrower@nvidia.com>
Reviewed-by: Jong Kim <jongk@nvidia.com>
Reviewed-by: Allen Martin <amartin@nvidia.com>
Reviewed-on: http://git-master/r/75541
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Tested-by: Varun Wadekar <vwadekar@nvidia.com>

drivers/net/r8169.c

index 35576b9..6d657ca 100644 (file)
@@ -5633,8 +5633,6 @@ static void rtl_set_rx_mode(struct net_device *dev)
                struct netdev_hw_addr *ha;
 
                rx_mode = AcceptBroadcast | AcceptMyPhys;
-               /* FIX ME: Allow all phy on Cardhu dock Ethernet */
-               rx_mode |= AcceptAllPhys;
                mc_filter[1] = mc_filter[0] = 0;
                netdev_for_each_mc_addr(ha, dev) {
                        int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26;