net: Restore unintentional reverts.

This restores commits:

c573972c11
1a5904342c
da2e2c2149

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: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2013-06-24 12:43:40 -07:00
parent 3717348840
commit d3c5f47ee2
3 changed files with 0 additions and 3 deletions

View File

@@ -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;