diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2018-05-09 17:40:44 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2018-05-09 17:40:44 +0200 |
| commit | 4c0330208f6bfe5285bae239fdb2a7ec1ce1f78d (patch) | |
| tree | 257c871b0be4c7eafa0e6911ab596bfb0f51a104 /drivers/infiniband/hw/nes/nes_nic.c | |
| parent | 7781edaed63e9396fc913e0899cb197562e6f1a0 (diff) | |
| parent | 76aa3de7095f15af7300012cb29ea8ab93eec348 (diff) | |
| download | talos-op-linux-4c0330208f6bfe5285bae239fdb2a7ec1ce1f78d.tar.gz talos-op-linux-4c0330208f6bfe5285bae239fdb2a7ec1ce1f78d.zip | |
Merge tag 'at24-4.17-rc5-fixes-for-wolfram' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-current
Single bug-fix for a regression introduced during the 4.17 merge window.
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_nic.c')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_nic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c index 0a75164cedea..007d5e8a0121 100644 --- a/drivers/infiniband/hw/nes/nes_nic.c +++ b/drivers/infiniband/hw/nes/nes_nic.c @@ -461,7 +461,7 @@ static bool nes_nic_send(struct sk_buff *skb, struct net_device *netdev) /** * nes_netdev_start_xmit */ -static int nes_netdev_start_xmit(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t nes_netdev_start_xmit(struct sk_buff *skb, struct net_device *netdev) { struct nes_vnic *nesvnic = netdev_priv(netdev); struct nes_device *nesdev = nesvnic->nesdev; |
