diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-08-24 20:25:15 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-08-24 20:25:15 -0400 |
| commit | a1139697adac394ce1fb06410b914f070b314f64 (patch) | |
| tree | 34beeb4d2030ac0c6accadedadde2b8b6fb23002 /drivers/infiniband/hw/usnic/usnic_fwd.h | |
| parent | accbef5cc624be745c1de903dd3a05681aaa0ac1 (diff) | |
| parent | 050da902adde8faf6b1bef15ac4876ae145358f4 (diff) | |
| download | op-kernel-dev-a1139697adac394ce1fb06410b914f070b314f64.zip op-kernel-dev-a1139697adac394ce1fb06410b914f070b314f64.tar.gz | |
Merge branch 'mellanox' into k.o/for-next
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/usnic/usnic_fwd.h')
| -rw-r--r-- | drivers/infiniband/hw/usnic/usnic_fwd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/usnic/usnic_fwd.h b/drivers/infiniband/hw/usnic/usnic_fwd.h index b2ac22b..0b2cc4e 100644 --- a/drivers/infiniband/hw/usnic/usnic_fwd.h +++ b/drivers/infiniband/hw/usnic/usnic_fwd.h @@ -75,7 +75,7 @@ struct usnic_fwd_dev *usnic_fwd_dev_alloc(struct pci_dev *pdev); void usnic_fwd_dev_free(struct usnic_fwd_dev *ufdev); void usnic_fwd_set_mac(struct usnic_fwd_dev *ufdev, char mac[ETH_ALEN]); -int usnic_fwd_add_ipaddr(struct usnic_fwd_dev *ufdev, __be32 inaddr); +void usnic_fwd_add_ipaddr(struct usnic_fwd_dev *ufdev, __be32 inaddr); void usnic_fwd_del_ipaddr(struct usnic_fwd_dev *ufdev); void usnic_fwd_carrier_up(struct usnic_fwd_dev *ufdev); void usnic_fwd_carrier_down(struct usnic_fwd_dev *ufdev); |
