diff options
| author | David S. Miller | 2012-10-31 19:25:33 +0100 |
|---|---|---|
| committer | David S. Miller | 2012-10-31 19:26:44 +0100 |
| commit | 810b6d7638a288216f99bd190470d67061c8bd88 (patch) | |
| tree | 5c8dd20b10cf4d7d40d286c9b3dd71d6dedaf78c /drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | |
| parent | ethernet: Convert dev_printk(KERN_<LEVEL> to dev_<level>( (diff) | |
| parent | igb: Fix sparse warning in igb_ptp_rx_pktstamp (diff) | |
| download | kernel-qcow2-linux-810b6d7638a288216f99bd190470d67061c8bd88.tar.gz kernel-qcow2-linux-810b6d7638a288216f99bd190470d67061c8bd88.tar.xz kernel-qcow2-linux-810b6d7638a288216f99bd190470d67061c8bd88.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
This series contains updates to ixgbe, ixgbevf, igbvf, igb and
networking core (bridge). Most notably is the addition of support
for local link multicast addresses in SR-IOV mode to the networking
core.
Also note, the ixgbe patch "ixgbe: Add support for pipeline reset" and
"ixgbe: Fix return value from macvlan filter function" is revised based
on community feedback.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index ac6a76deb01d..c281ee9c9e2a 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c @@ -2978,6 +2978,11 @@ static int ixgbevf_xmit_frame(struct sk_buff *skb, struct net_device *netdev) #if PAGE_SIZE > IXGBE_MAX_DATA_PER_TXD unsigned short f; #endif + u8 *dst_mac = skb_header_pointer(skb, 0, 0, NULL); + if (!dst_mac || is_link_local(dst_mac)) { + dev_kfree_skb(skb); + return NETDEV_TX_OK; + } tx_ring = &adapter->tx_ring[r_idx]; |