summaryrefslogtreecommitdiff
path: root/include/net/protocol.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-10-21 13:09:18 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-10-21 13:09:18 +0200
commita2ab5fc41533c952706ebdfaa378bb746e535cc1 (patch)
tree9fb86bb4e9ecb67f7e651d284c2f12c6c5d4378f /include/net/protocol.h
parenta380f2edef65b2447a043251bb3c00a9d2153a8b (diff)
parent0e708fc602531b8355b5de6ea7c98f09129b223f (diff)
downloadlwn-a2ab5fc41533c952706ebdfaa378bb746e535cc1.tar.gz
lwn-a2ab5fc41533c952706ebdfaa378bb746e535cc1.zip
Merge branch 'pm-sleep' into pm-core
Diffstat (limited to 'include/net/protocol.h')
-rw-r--r--include/net/protocol.h4
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,