diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-09 03:02:35 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-09 03:02:35 -0400 |
| commit | 1236d6bb6e19fc72ffc6bbcdeb1bfefe450e54ee (patch) | |
| tree | 47da3feee8e263e8c9352c85cf518e624be3c211 /include/net/protocol.h | |
| parent | 750b1a6894ecc9b178c6e3d0a1170122971b2036 (diff) | |
| parent | 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f (diff) | |
Merge 4.14-rc4 into staging-next
We want the staging/iio fixes in here as well to handle merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/net/protocol.h')
| -rw-r--r-- | include/net/protocol.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/protocol.h b/include/net/protocol.h index 65ba335b0e7e..4fc75f7ae23b 100644 --- a/include/net/protocol.h +++ b/include/net/protocol.h | |||
| @@ -39,8 +39,8 @@ | |||
| 39 | 39 | ||
| 40 | /* This is used to register protocols. */ | 40 | /* This is used to register protocols. */ |
| 41 | struct net_protocol { | 41 | struct net_protocol { |
| 42 | void (*early_demux)(struct sk_buff *skb); | 42 | int (*early_demux)(struct sk_buff *skb); |
| 43 | void (*early_demux_handler)(struct sk_buff *skb); | 43 | int (*early_demux_handler)(struct sk_buff *skb); |
| 44 | int (*handler)(struct sk_buff *skb); | 44 | int (*handler)(struct sk_buff *skb); |
| 45 | void (*err_handler)(struct sk_buff *skb, u32 info); | 45 | void (*err_handler)(struct sk_buff *skb, u32 info); |
| 46 | unsigned int no_policy:1, | 46 | unsigned int no_policy:1, |