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

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

net: Revert unused variable changes.



This reverts commits:

c573972c
1a590434
da2e2c21

They were meant for net-next not net.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 497574c7
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -1016,6 +1016,7 @@ 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;

+1 −0
Original line number Diff line number Diff line
@@ -483,6 +483,7 @@ 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)
+1 −0
Original line number Diff line number Diff line
@@ -995,6 +995,7 @@ 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