diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 10:32:47 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 10:32:50 +1100 |
| commit | 1a6324a0cc91d9d99078744f45be71f8f53d6112 (patch) | |
| tree | 72f953c4a30d4cd28aa30afc7dccf5d28ed67604 /include/linux/mroute6.h | |
| parent | 1206e4b40d30f6ec9628351bcdbef31bd0e31baf (diff) | |
| parent | f3caf8618bce7e86c6f4f86785dd004c71b63a2d (diff) | |
Merge remote-tracking branch 'net-next/master'
Diffstat (limited to 'include/linux/mroute6.h')
| -rw-r--r-- | include/linux/mroute6.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h index 19a1c0c2993b..ce44e3e96d27 100644 --- a/include/linux/mroute6.h +++ b/include/linux/mroute6.h @@ -116,7 +116,7 @@ struct mfc6_cache { struct rtmsg; extern int ip6mr_get_route(struct net *net, struct sk_buff *skb, - struct rtmsg *rtm, int nowait, u32 portid); + struct rtmsg *rtm, u32 portid); #ifdef CONFIG_IPV6_MROUTE extern struct sock *mroute6_socket(struct net *net, struct sk_buff *skb); |