diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-05-31 02:04:46 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-31 02:04:46 -0400 |
commit | 86d15cd83363a9787039895cb1a1b6be50f82ad3 (patch) | |
tree | 49145230381c8113766a946b208565a8cd8d585d | |
parent | 342a437ef625953e8bdeee3bc1605ccd27a38863 (diff) |
net: unset IFF_XMIT_DST_RELEASE for qeth and ipoib
Last two drivers that need skb->dst in their start_xmit() function
Tell dev_hard_start_xmit() to no release it by unsetting IFF_XMIT_DST_RELEASE
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_main.c | 1 | ||||
-rw-r--r-- | drivers/s390/net/qeth_l3_main.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c index ab2c192c76bc..69c6304cc943 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c | |||
@@ -1053,6 +1053,7 @@ static void ipoib_setup(struct net_device *dev) | |||
1053 | dev->tx_queue_len = ipoib_sendq_size * 2; | 1053 | dev->tx_queue_len = ipoib_sendq_size * 2; |
1054 | dev->features = (NETIF_F_VLAN_CHALLENGED | | 1054 | dev->features = (NETIF_F_VLAN_CHALLENGED | |
1055 | NETIF_F_HIGHDMA); | 1055 | NETIF_F_HIGHDMA); |
1056 | dev->priv_flags &= ~IFF_XMIT_DST_RELEASE; | ||
1056 | 1057 | ||
1057 | memcpy(dev->broadcast, ipv4_bcast_addr, INFINIBAND_ALEN); | 1058 | memcpy(dev->broadcast, ipv4_bcast_addr, INFINIBAND_ALEN); |
1058 | 1059 | ||
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c index b36b5cdf9000..cb64b0b534a2 100644 --- a/drivers/s390/net/qeth_l3_main.c +++ b/drivers/s390/net/qeth_l3_main.c | |||
@@ -3012,6 +3012,7 @@ static int qeth_l3_setup_netdev(struct qeth_card *card) | |||
3012 | card->dev->features |= NETIF_F_HW_VLAN_TX | | 3012 | card->dev->features |= NETIF_F_HW_VLAN_TX | |
3013 | NETIF_F_HW_VLAN_RX | | 3013 | NETIF_F_HW_VLAN_RX | |
3014 | NETIF_F_HW_VLAN_FILTER; | 3014 | NETIF_F_HW_VLAN_FILTER; |
3015 | card->dev->priv_flags &= ~IFF_XMIT_DST_RELEASE; | ||
3015 | 3016 | ||
3016 | SET_NETDEV_DEV(card->dev, &card->gdev->dev); | 3017 | SET_NETDEV_DEV(card->dev, &card->gdev->dev); |
3017 | return register_netdev(card->dev); | 3018 | return register_netdev(card->dev); |