diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-10-09 14:11:30 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-10-09 14:11:30 +0200 |
| commit | 545633f6fecd240bfa50bb8e2db627eac76f9f8a (patch) | |
| tree | 7b68d3d5d49e352c5d1eaecd5e0958db89bda09a /include/net/protocol.h | |
| parent | 3a9fce327ff9cabf7f89d3f20616a83af28393da (diff) | |
| parent | 5803b023881857db32ffefa0d269c90280a67ee0 (diff) | |
Merge branch 'for-linus' into for-next
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 @@ /* This is used to register protocols. */ struct net_protocol { - void (*early_demux)(struct sk_buff *skb); - void (*early_demux_handler)(struct sk_buff *skb); + int (*early_demux)(struct sk_buff *skb); + int (*early_demux_handler)(struct sk_buff *skb); int (*handler)(struct sk_buff *skb); void (*err_handler)(struct sk_buff *skb, u32 info); unsigned int no_policy:1, |