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

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
...@@ -1016,7 +1016,6 @@ static void bmac_set_multicast(struct net_device *dev) ...@@ -1016,7 +1016,6 @@ static void bmac_set_multicast(struct net_device *dev)
static void bmac_set_multicast(struct net_device *dev) static void bmac_set_multicast(struct net_device *dev)
{ {
struct netdev_hw_addr *ha; struct netdev_hw_addr *ha;
int i;
unsigned short rx_cfg; unsigned short rx_cfg;
u32 crc; u32 crc;
......
...@@ -483,7 +483,6 @@ static void korina_multicast_list(struct net_device *dev) ...@@ -483,7 +483,6 @@ static void korina_multicast_list(struct net_device *dev)
unsigned long flags; unsigned long flags;
struct netdev_hw_addr *ha; struct netdev_hw_addr *ha;
u32 recognise = ETH_ARC_AB; /* always accept broadcasts */ u32 recognise = ETH_ARC_AB; /* always accept broadcasts */
int i;
/* Set promiscuous mode */ /* Set promiscuous mode */
if (dev->flags & IFF_PROMISC) if (dev->flags & IFF_PROMISC)
......
...@@ -995,7 +995,6 @@ static void bigmac_set_multicast(struct net_device *dev) ...@@ -995,7 +995,6 @@ static void bigmac_set_multicast(struct net_device *dev)
struct bigmac *bp = netdev_priv(dev); struct bigmac *bp = netdev_priv(dev);
void __iomem *bregs = bp->bregs; void __iomem *bregs = bp->bregs;
struct netdev_hw_addr *ha; struct netdev_hw_addr *ha;
int i;
u32 tmp, crc; u32 tmp, crc;
/* Disable the receiver. The bit self-clears when /* Disable the receiver. The bit self-clears when
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment