be2net: use common method to check for sriov function type
authorAjit Khaparde <ajit.khaparde@emulex.com>
Wed, 6 Apr 2011 18:08:01 +0000 (18:08 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 7 Apr 2011 22:04:44 +0000 (15:04 -0700)
Lancer and BE can both use SLI_INTF_REG to check a VF or a PF.

Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/benet/be.h

index ab5be0545e38640b5b8b3889c4c013f8db0e698e..7e2040084654f80f91d5eb2cd81845ac3c0ec9d1 100644 (file)
@@ -458,18 +458,10 @@ static inline u8 is_udp_pkt(struct sk_buff *skb)
 
 static inline void be_check_sriov_fn_type(struct be_adapter *adapter)
 {
-       u8 data;
        u32 sli_intf;
 
-       if (lancer_chip(adapter)) {
-               pci_read_config_dword(adapter->pdev, SLI_INTF_REG_OFFSET,
-                                                               &sli_intf);
-               adapter->is_virtfn = (sli_intf & SLI_INTF_FT_MASK) ? 1 : 0;
-       } else {
-               pci_write_config_byte(adapter->pdev, 0xFE, 0xAA);
-               pci_read_config_byte(adapter->pdev, 0xFE, &data);
-               adapter->is_virtfn = (data != 0xAA);
-       }
+       pci_read_config_dword(adapter->pdev, SLI_INTF_REG_OFFSET, &sli_intf);
+       adapter->is_virtfn = (sli_intf & SLI_INTF_FT_MASK) ? 1 : 0;
 }
 
 static inline void be_vf_eth_addr_generate(struct be_adapter *adapter, u8 *mac)