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

Commit fb6fafbc authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

3c515: fix integer overflow warning 



clang points out a harmless signed integer overflow:

drivers/net/ethernet/3com/3c515.c:1530:66: error: implicit conversion from 'int' to 'short' changes value from 32783 to -32753 [-Werror,-Wconstant-conversion]
                new_mode = SetRxFilter | RxStation | RxMulticast | RxBroadcast | RxProm;
                         ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~
drivers/net/ethernet/3com/3c515.c:1532:52: error: implicit conversion from 'int' to 'short' changes value from 32775 to -32761 [-Werror,-Wconstant-conversion]
                new_mode = SetRxFilter | RxStation | RxMulticast | RxBroadcast;
                         ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~
drivers/net/ethernet/3com/3c515.c:1534:38: error: implicit conversion from 'int' to 'short' changes value from 32773 to -32763 [-Werror,-Wconstant-conversion]
                new_mode = SetRxFilter | RxStation | RxBroadcast;
                         ~ ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~

Make the variable unsigned to avoid the overflow.

Fixes: Linux-2.1.128pre1
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e0aa6770

drivers/net/ethernet/3com/3c515.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1521,7 +1521,7 @@ static void update_stats(int ioaddr, struct net_device *dev) 
static void set_rx_mode(struct net_device *dev)

static void set_rx_mode(struct net_device *dev)

{

{

	int ioaddr = dev->base_addr;

	int ioaddr = dev->base_addr;

	short new_mode;

	unsigned short new_mode;





	if (dev->flags & IFF_PROMISC) {

	if (dev->flags & IFF_PROMISC) {

		if (corkscrew_debug > 3)

		if (corkscrew_debug > 3)