Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 376159
b: refs/heads/master
c: 147a908
h: refs/heads/master
i:
  376157: 943aeda
  376155: ba1ac27
  376151: d20c38b
  376143: 805b2a0
  376127: dc7a25f
v: v3
  • Loading branch information
Shahed Shaikh authored and David S. Miller committed May 22, 2013
1 parent 00dbdb1 commit 5b6086f
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 47 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0ce54ce4aaef1389fb8d640271748ace257cb763
refs/heads/master: 147a90887baa98d73db1fa7ed9e755bf48960c21
6 changes: 6 additions & 0 deletions trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -907,8 +907,11 @@ struct qlcnic_ipaddr {
#define QLCNIC_FW_HANG 0x4000
#define QLCNIC_FW_LRO_MSS_CAP 0x8000
#define QLCNIC_TX_INTR_SHARED 0x10000
#define QLCNIC_APP_CHANGED_FLAGS 0x20000
#define QLCNIC_IS_MSI_FAMILY(adapter) \
((adapter)->flags & (QLCNIC_MSI_ENABLED | QLCNIC_MSIX_ENABLED))
#define QLCNIC_IS_TSO_CAPABLE(adapter) \
((adapter)->ahw->capabilities & QLCNIC_FW_CAPABILITY_TSO)

#define QLCNIC_DEF_NUM_STS_DESC_RINGS 4
#define QLCNIC_MSIX_TBL_SPACE 8192
Expand Down Expand Up @@ -1034,6 +1037,7 @@ struct qlcnic_adapter {
spinlock_t rx_mac_learn_lock;
u32 file_prd_off; /*File fw product offset*/
u32 fw_version;
u32 offload_flags;
const struct firmware *fw;
};

Expand Down Expand Up @@ -1542,6 +1546,8 @@ void qlcnic_add_lb_filter(struct qlcnic_adapter *, struct sk_buff *, int, u16);
int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter);
int qlcnic_read_mac_addr(struct qlcnic_adapter *);
int qlcnic_setup_netdev(struct qlcnic_adapter *, struct net_device *, int);
void qlcnic_set_netdev_features(struct qlcnic_adapter *,
struct qlcnic_esw_func_cfg *);
void qlcnic_sriov_vf_schedule_multi(struct net_device *);
void qlcnic_vf_add_mc_list(struct net_device *, u16);

Expand Down
49 changes: 45 additions & 4 deletions trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -973,16 +973,57 @@ int qlcnic_change_mtu(struct net_device *netdev, int mtu)
return rc;
}

static netdev_features_t qlcnic_process_flags(struct qlcnic_adapter *adapter,
netdev_features_t features)
{
u32 offload_flags = adapter->offload_flags;

if (offload_flags & BIT_0) {
features |= NETIF_F_RXCSUM | NETIF_F_IP_CSUM |
NETIF_F_IPV6_CSUM;
adapter->rx_csum = 1;
if (QLCNIC_IS_TSO_CAPABLE(adapter)) {
if (!(offload_flags & BIT_1))
features &= ~NETIF_F_TSO;
else
features |= NETIF_F_TSO;

if (!(offload_flags & BIT_2))
features &= ~NETIF_F_TSO6;
else
features |= NETIF_F_TSO6;
}
} else {
features &= ~(NETIF_F_RXCSUM |
NETIF_F_IP_CSUM |
NETIF_F_IPV6_CSUM);

if (QLCNIC_IS_TSO_CAPABLE(adapter))
features &= ~(NETIF_F_TSO | NETIF_F_TSO6);
adapter->rx_csum = 0;
}

return features;
}

netdev_features_t qlcnic_fix_features(struct net_device *netdev,
netdev_features_t features)
{
struct qlcnic_adapter *adapter = netdev_priv(netdev);
netdev_features_t changed;

if ((adapter->flags & QLCNIC_ESWITCH_ENABLED) &&
qlcnic_82xx_check(adapter)) {
netdev_features_t changed = features ^ netdev->features;
features ^= changed & (NETIF_F_ALL_CSUM | NETIF_F_RXCSUM);
if (qlcnic_82xx_check(adapter) &&
(adapter->flags & QLCNIC_ESWITCH_ENABLED)) {
if (adapter->flags & QLCNIC_APP_CHANGED_FLAGS) {
features = qlcnic_process_flags(adapter, features);
} else {
changed = features ^ netdev->features;
features ^= changed & (NETIF_F_RXCSUM |
NETIF_F_IP_CSUM |
NETIF_F_IPV6_CSUM |
NETIF_F_TSO |
NETIF_F_TSO6);
}
}

if (!(features & NETIF_F_RXCSUM))
Expand Down
49 changes: 7 additions & 42 deletions trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,9 @@ static int qlcnic_start_firmware(struct qlcnic_adapter *);
static void qlcnic_free_lb_filters_mem(struct qlcnic_adapter *adapter);
static void qlcnic_dev_set_npar_ready(struct qlcnic_adapter *);
static int qlcnicvf_start_firmware(struct qlcnic_adapter *);
static void qlcnic_set_netdev_features(struct qlcnic_adapter *,
struct qlcnic_esw_func_cfg *);
static int qlcnic_vlan_rx_add(struct net_device *, __be16, u16);
static int qlcnic_vlan_rx_del(struct net_device *, __be16, u16);

#define QLCNIC_IS_TSO_CAPABLE(adapter) \
((adapter)->ahw->capabilities & QLCNIC_FW_CAPABILITY_TSO)

static u32 qlcnic_vlan_tx_check(struct qlcnic_adapter *adapter)
{
struct qlcnic_hardware_context *ahw = adapter->ahw;
Expand Down Expand Up @@ -1074,8 +1069,6 @@ void qlcnic_set_eswitch_port_features(struct qlcnic_adapter *adapter,

if (!esw_cfg->promisc_mode)
adapter->flags |= QLCNIC_PROMISC_DISABLED;

qlcnic_set_netdev_features(adapter, esw_cfg);
}

int qlcnic_set_eswitch_port_config(struct qlcnic_adapter *adapter)
Expand All @@ -1090,51 +1083,23 @@ int qlcnic_set_eswitch_port_config(struct qlcnic_adapter *adapter)
return -EIO;
qlcnic_set_vlan_config(adapter, &esw_cfg);
qlcnic_set_eswitch_port_features(adapter, &esw_cfg);
qlcnic_set_netdev_features(adapter, &esw_cfg);

return 0;
}

static void
qlcnic_set_netdev_features(struct qlcnic_adapter *adapter,
struct qlcnic_esw_func_cfg *esw_cfg)
void qlcnic_set_netdev_features(struct qlcnic_adapter *adapter,
struct qlcnic_esw_func_cfg *esw_cfg)
{
struct net_device *netdev = adapter->netdev;
unsigned long features, vlan_features;

if (qlcnic_83xx_check(adapter))
return;

features = (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_RXCSUM |
NETIF_F_IPV6_CSUM | NETIF_F_GRO);
vlan_features = (NETIF_F_SG | NETIF_F_IP_CSUM |
NETIF_F_IPV6_CSUM);

if (QLCNIC_IS_TSO_CAPABLE(adapter)) {
features |= (NETIF_F_TSO | NETIF_F_TSO6);
vlan_features |= (NETIF_F_TSO | NETIF_F_TSO6);
}

if (netdev->features & NETIF_F_LRO)
features |= NETIF_F_LRO;

if (esw_cfg->offload_flags & BIT_0) {
netdev->features |= features;
adapter->rx_csum = 1;
if (!(esw_cfg->offload_flags & BIT_1)) {
netdev->features &= ~NETIF_F_TSO;
features &= ~NETIF_F_TSO;
}
if (!(esw_cfg->offload_flags & BIT_2)) {
netdev->features &= ~NETIF_F_TSO6;
features &= ~NETIF_F_TSO6;
}
} else {
netdev->features &= ~features;
features &= ~features;
adapter->rx_csum = 0;
}

netdev->vlan_features = (features & vlan_features);
adapter->offload_flags = esw_cfg->offload_flags;
adapter->flags |= QLCNIC_APP_CHANGED_FLAGS;
netdev_update_features(netdev);
adapter->flags &= ~QLCNIC_APP_CHANGED_FLAGS;
}

static int
Expand Down
3 changes: 3 additions & 0 deletions trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,9 @@ static ssize_t qlcnic_sysfs_write_esw_config(struct file *file,
switch (esw_cfg[i].op_mode) {
case QLCNIC_PORT_DEFAULTS:
qlcnic_set_eswitch_port_features(adapter, &esw_cfg[i]);
rtnl_lock();
qlcnic_set_netdev_features(adapter, &esw_cfg[i]);
rtnl_unlock();
break;
case QLCNIC_ADD_VLAN:
qlcnic_set_vlan_config(adapter, &esw_cfg[i]);
Expand Down

0 comments on commit 5b6086f

Please sign in to comment.