Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3c5f47e authored by David S. Miller's avatar David S. Miller
Browse files

net: Restore unintentional reverts. 



This restores commits:

c573972c
1a590434
da2e2c21

which initially accidently went into 'net', were
reverted there, and then properly placed into 'net-next'.
But the next net --> net-next merge accidently wiped them
out again.

Reported-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 37173488

drivers/net/ethernet/apple/bmac.c

+0 −1
Original line number Diff line number Diff line
@@ -1016,7 +1016,6 @@ static void bmac_set_multicast(struct net_device *dev) 
static void bmac_set_multicast(struct net_device *dev)

{

	struct netdev_hw_addr *ha;

	int i;

	unsigned short rx_cfg;

	u32 crc;

drivers/net/ethernet/korina.c

+0 −1
Original line number Diff line number Diff line
@@ -483,7 +483,6 @@ static void korina_multicast_list(struct net_device *dev) 
	unsigned long flags;

	struct netdev_hw_addr *ha;

	u32 recognise = ETH_ARC_AB;	/* always accept broadcasts */

	int i;



	/* Set promiscuous mode */

	if (dev->flags & IFF_PROMISC)

drivers/net/ethernet/sun/sunbmac.c

+0 −1
Original line number Diff line number Diff line
@@ -995,7 +995,6 @@ static void bigmac_set_multicast(struct net_device *dev) 
	struct bigmac *bp = netdev_priv(dev);

	void __iomem *bregs = bp->bregs;

	struct netdev_hw_addr *ha;

	int i;

	u32 tmp, crc;



	/* Disable the receiver.  The bit self-clears when