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

Commit ac5ac789 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by David S. Miller
Browse files

ixgb: eliminate checkstack warnings 



Really trivial fix, use kmalloc/kfree instead of stack space.
use static const instead of const to further reduce stack usage.

V2: reflect changes suggested by Joe Perches

before:
[jbrandeb@jbrandeb-mobl2 linux-2.6]$ make checkstack|grep '\[ixgb\]'
0x00000fc1 ixgb_set_multi [ixgb]:                       768
0x00001031 ixgb_set_multi [ixgb]:                       768
0x000010f2 ixgb_set_multi [ixgb]:                       768
0x061c ixgb_check_options [ixgb]:                       448
0x09c3 ixgb_check_options [ixgb]:                       448
0x0000649e ixgb_set_ringparam [ixgb]:                   192
0x0000130d ixgb_xmit_frame [ixgb]:                      184
0x000019e0 ixgb_xmit_frame [ixgb]:                      184
0x00002267 ixgb_clean [ixgb]:                           152
0x00002673 ixgb_clean [ixgb]:                           152

after:
0x000064ee ixgb_set_ringparam [ixgb]:                   192
0x0000135d ixgb_xmit_frame [ixgb]:                      184
0x00001a30 ixgb_xmit_frame [ixgb]:                      184
0x000022b7 ixgb_clean [ixgb]:                           152
0x000026c3 ixgb_clean [ixgb]:                           152

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 120deefa

drivers/net/ethernet/intel/ixgb/ixgb_ee.c

+1 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ ixgb_get_ee_mac_addr(struct ixgb_hw *hw, 
	ENTER();



	if (ixgb_check_and_get_eeprom_data(hw) == true) {

		for (i = 0; i < IXGB_ETH_LENGTH_OF_ADDRESS; i++) {

		for (i = 0; i < ETH_ALEN; i++) {

			mac_addr[i] = ee_map->mac_addr[i];

		}

		pr_debug("eeprom mac address = %pM\n", mac_addr);

drivers/net/ethernet/intel/ixgb/ixgb_ee.h

+1 −3
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ 


#define IXGB_EEPROM_SIZE    64	/* Size in words */



#define IXGB_ETH_LENGTH_OF_ADDRESS   6



/* EEPROM Commands */

#define EEPROM_READ_OPCODE  0x6	/* EEPROM read opcode */

#define EEPROM_WRITE_OPCODE 0x5	/* EEPROM write opcode */
@@ -75,7 +73,7 @@ 


/* EEPROM structure */

struct ixgb_ee_map_type {

	u8 mac_addr[IXGB_ETH_LENGTH_OF_ADDRESS];

	u8 mac_addr[ETH_ALEN];

	__le16 compatibility;

	__le16 reserved1[4];

	__le32 pba_number;

drivers/net/ethernet/intel/ixgb/ixgb_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ ixgb_mc_addr_list_update(struct ixgb_hw *hw, 
			ixgb_mta_set(hw, hash_value);

		}



		mca += IXGB_ETH_LENGTH_OF_ADDRESS + pad;

		mca += ETH_ALEN + pad;

	}



	pr_debug("MC Update Complete\n");

drivers/net/ethernet/intel/ixgb/ixgb_hw.h

+1 −3
Original line number Diff line number Diff line
@@ -97,8 +97,6 @@ typedef enum { 
	ixgb_bus_width_64

} ixgb_bus_width;



#define IXGB_ETH_LENGTH_OF_ADDRESS   6



#define IXGB_EEPROM_SIZE    64	/* Size in words */



#define SPEED_10000  10000
@@ -674,7 +672,7 @@ struct ixgb_hw { 
	u32 max_frame_size;	/* Maximum frame size supported     */

	u32 mc_filter_type;	/* Multicast filter hash type       */

	u32 num_mc_addrs;	/* Number of current Multicast addrs */

	u8 curr_mac_addr[IXGB_ETH_LENGTH_OF_ADDRESS];	/* Individual address currently programmed in MAC */

	u8 curr_mac_addr[ETH_ALEN];	/* Individual address currently programmed in MAC */

	u32 num_tx_desc;	/* Number of Transmit descriptors   */

	u32 num_rx_desc;	/* Number of Receive descriptors    */

	u32 rx_buffer_size;	/* Size of Receive buffer           */

drivers/net/ethernet/intel/ixgb/ixgb_main.c

+14 −7
Original line number Diff line number Diff line
@@ -1093,7 +1093,6 @@ ixgb_set_multi(struct net_device *netdev) 
	struct ixgb_hw *hw = &adapter->hw;

	struct netdev_hw_addr *ha;

	u32 rctl;

	int i;



	/* Check for Promiscuous and All Multicast modes */
@@ -1120,19 +1119,27 @@ ixgb_set_multi(struct net_device *netdev) 
		rctl |= IXGB_RCTL_MPE;

		IXGB_WRITE_REG(hw, RCTL, rctl);

	} else {

		u8 mta[IXGB_MAX_NUM_MULTICAST_ADDRESSES *

			    IXGB_ETH_LENGTH_OF_ADDRESS];

		u8 *mta = kmalloc(IXGB_MAX_NUM_MULTICAST_ADDRESSES *

			      ETH_ALEN, GFP_ATOMIC);

		u8 *addr;

		if (!mta) {

			pr_err("allocation of multicast memory failed\n");

			goto alloc_failed;

		}



		IXGB_WRITE_REG(hw, RCTL, rctl);



		i = 0;

		netdev_for_each_mc_addr(ha, netdev)

			memcpy(&mta[i++ * IXGB_ETH_LENGTH_OF_ADDRESS],

			       ha->addr, IXGB_ETH_LENGTH_OF_ADDRESS);

		addr = mta;

		netdev_for_each_mc_addr(ha, netdev) {

			memcpy(addr, ha->addr, ETH_ALEN);

			addr += ETH_ALEN;

		}



		ixgb_mc_addr_list_update(hw, mta, netdev_mc_count(netdev), 0);

		kfree(mta);

	}



alloc_failed:

	if (netdev->features & NETIF_F_HW_VLAN_RX)

		ixgb_vlan_strip_enable(adapter);

	else