diff options
| author | David S. Miller <davem@davemloft.net> | 2016-10-14 11:59:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-14 11:59:59 -0400 |
| commit | 9c7664cbe7067e732daaa6600c25da1f19c8a6e8 (patch) | |
| tree | fc5b6d4c946488b2894f506c49eae6c748c76c13 /include | |
| parent | d0b3fbb2306f27d622d4592f4dc3a1f726e68fed (diff) | |
| parent | d5df7688b6a36dbb5611a58229a5e294cd978999 (diff) | |
| download | linux-9c7664cbe7067e732daaa6600c25da1f19c8a6e8.tar.gz linux-9c7664cbe7067e732daaa6600c25da1f19c8a6e8.zip | |
Merge branch 'qed-next'
Manish Chopra says:
====================
qed*: driver updates
There are several new additions in this series;
Most are connected to either Tx offloading or Rx classifications
[either fastpath changes or supporting configuration].
In addition, there's a single IOV enhancement.
Please consider applying this series to `net-next'.
V2->V3:
Fixes below kbuild warning
call to '__compiletime_assert_60' declared with
attribute error: Need native word sized stores/loads for atomicity.
V1->V2:
Added a fix for the race in ramrod handling
pointed by Eric Dumazet [patch 7].
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/qed/qed_eth_if.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/qed/qed_eth_if.h b/include/linux/qed/qed_eth_if.h index 33c24ebc9b7f..15130805d792 100644 --- a/include/linux/qed/qed_eth_if.h +++ b/include/linux/qed/qed_eth_if.h @@ -23,6 +23,7 @@ struct qed_dev_eth_info { u8 port_mac[ETH_ALEN]; u8 num_vlan_filters; + u16 num_mac_filters; /* Legacy VF - this affects the datapath, so qede has to know */ bool is_legacy; @@ -129,7 +130,7 @@ struct qed_tunn_params { struct qed_eth_cb_ops { struct qed_common_cb_ops common; - void (*force_mac) (void *dev, u8 *mac); + void (*force_mac) (void *dev, u8 *mac, bool forced); }; #ifdef CONFIG_DCB |