diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netdevice.h | 2 | ||||
| -rw-r--r-- | include/scsi/libfc.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index b3d00fa4b314..8bfa95600e48 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -895,7 +895,7 @@ struct netdev_fcoe_hbainfo { | |||
| 895 | * | 895 | * |
| 896 | * int (*ndo_bridge_setlink)(struct net_device *dev, struct nlmsghdr *nlh) | 896 | * int (*ndo_bridge_setlink)(struct net_device *dev, struct nlmsghdr *nlh) |
| 897 | * int (*ndo_bridge_getlink)(struct sk_buff *skb, u32 pid, u32 seq, | 897 | * int (*ndo_bridge_getlink)(struct sk_buff *skb, u32 pid, u32 seq, |
| 898 | * struct net_device *dev) | 898 | * struct net_device *dev, u32 filter_mask) |
| 899 | * | 899 | * |
| 900 | * int (*ndo_change_carrier)(struct net_device *dev, bool new_carrier); | 900 | * int (*ndo_change_carrier)(struct net_device *dev, bool new_carrier); |
| 901 | * Called to change device carrier. Soft-devices (like dummy, team, etc) | 901 | * Called to change device carrier. Soft-devices (like dummy, team, etc) |
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h index 399162b50a8d..e1379b4e8faf 100644 --- a/include/scsi/libfc.h +++ b/include/scsi/libfc.h | |||
| @@ -1074,7 +1074,8 @@ void fc_rport_terminate_io(struct fc_rport *); | |||
| 1074 | /* | 1074 | /* |
| 1075 | * DISCOVERY LAYER | 1075 | * DISCOVERY LAYER |
| 1076 | *****************************/ | 1076 | *****************************/ |
| 1077 | int fc_disc_init(struct fc_lport *); | 1077 | void fc_disc_init(struct fc_lport *); |
| 1078 | void fc_disc_config(struct fc_lport *, void *); | ||
| 1078 | 1079 | ||
| 1079 | static inline struct fc_lport *fc_disc_lport(struct fc_disc *disc) | 1080 | static inline struct fc_lport *fc_disc_lport(struct fc_disc *disc) |
| 1080 | { | 1081 | { |
