Skip to content

L
linux
Commit cb178190 authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge branch '20130926_include_linux_networking_externs' of git://repo.or.cz/linux-2.6/trivial-mods 

Conflicts:
	include/linux/netdevice.h

More extern removals from Joe Perches.

Minor conflict with the dev_notify_flags changes which added a new
argument to __dev_notify_flags().
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7b77d161 f629d208
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 530 additions and 588 deletions
include/linux/etherdevice.h
View file @ cb178190
...@@ -28,27 +28,24 @@ ...@@ -28,27 +28,24 @@
#include <asm/unaligned.h> #include <asm/unaligned.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
extern __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev); __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev);
extern const struct header_ops eth_header_ops; extern const struct header_ops eth_header_ops;
extern int eth_header(struct sk_buff *skb, struct net_device *dev, int eth_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
unsigned short type, const void *daddr, const void *saddr, unsigned len);
const void *daddr, const void *saddr, unsigned len); int eth_rebuild_header(struct sk_buff *skb);
extern int eth_rebuild_header(struct sk_buff *skb); int eth_header_parse(const struct sk_buff *skb, unsigned char *haddr);
extern int eth_header_parse(const struct sk_buff *skb, unsigned char *haddr); int eth_header_cache(const struct neighbour *neigh, struct hh_cache *hh,
extern int eth_header_cache(const struct neighbour *neigh, struct hh_cache *hh, __be16 type); __be16 type);
extern void eth_header_cache_update(struct hh_cache *hh, void eth_header_cache_update(struct hh_cache *hh, const struct net_device *dev,
const struct net_device *dev, const unsigned char *haddr);
const unsigned char *haddr); int eth_prepare_mac_addr_change(struct net_device *dev, void *p);
extern int eth_prepare_mac_addr_change(struct net_device *dev, void *p); void eth_commit_mac_addr_change(struct net_device *dev, void *p);
extern void eth_commit_mac_addr_change(struct net_device *dev, void *p); int eth_mac_addr(struct net_device *dev, void *p);
extern int eth_mac_addr(struct net_device *dev, void *p); int eth_change_mtu(struct net_device *dev, int new_mtu);
extern int eth_change_mtu(struct net_device *dev, int new_mtu); int eth_validate_addr(struct net_device *dev);
extern int eth_validate_addr(struct net_device *dev);
struct net_device *alloc_etherdev_mqs(int sizeof_priv, unsigned int txqs,
extern struct net_device *alloc_etherdev_mqs(int sizeof_priv, unsigned int txqs,
unsigned int rxqs); unsigned int rxqs);
#define alloc_etherdev(sizeof_priv) alloc_etherdev_mq(sizeof_priv, 1) #define alloc_etherdev(sizeof_priv) alloc_etherdev_mq(sizeof_priv, 1)
#define alloc_etherdev_mq(sizeof_priv, count) alloc_etherdev_mqs(sizeof_priv, count, count) #define alloc_etherdev_mq(sizeof_priv, count) alloc_etherdev_mqs(sizeof_priv, count, count)
......
include/linux/fcdevice.h
View file @ cb178190
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <linux/if_fc.h> #include <linux/if_fc.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
extern struct net_device *alloc_fcdev(int sizeof_priv); struct net_device *alloc_fcdev(int sizeof_priv);
#endif #endif
#endif /* _LINUX_FCDEVICE_H */ #endif /* _LINUX_FCDEVICE_H */
include/linux/fddidevice.h
View file @ cb178190
...@@ -25,10 +25,9 @@ ...@@ -25,10 +25,9 @@
#include <linux/if_fddi.h> #include <linux/if_fddi.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
extern __be16 fddi_type_trans(struct sk_buff *skb, __be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev);
struct net_device *dev); int fddi_change_mtu(struct net_device *dev, int new_mtu);
extern int fddi_change_mtu(struct net_device *dev, int new_mtu); struct net_device *alloc_fddidev(int sizeof_priv);
extern struct net_device *alloc_fddidev(int sizeof_priv);
#endif #endif
#endif /* _LINUX_FDDIDEVICE_H */ #endif /* _LINUX_FDDIDEVICE_H */
include/linux/hippidevice.h
View file @ cb178190
...@@ -31,11 +31,11 @@ struct hippi_cb { ...@@ -31,11 +31,11 @@ struct hippi_cb {
__u32 ifield; __u32 ifield;
}; };
extern __be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev); __be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev);
extern int hippi_change_mtu(struct net_device *dev, int new_mtu); int hippi_change_mtu(struct net_device *dev, int new_mtu);
extern int hippi_mac_addr(struct net_device *dev, void *p); int hippi_mac_addr(struct net_device *dev, void *p);
extern int hippi_neigh_setup_dev(struct net_device *dev, struct neigh_parms *p); int hippi_neigh_setup_dev(struct net_device *dev, struct neigh_parms *p);
extern struct net_device *alloc_hippi_dev(int sizeof_priv); struct net_device *alloc_hippi_dev(int sizeof_priv);
#endif #endif
#endif /* _LINUX_HIPPIDEVICE_H */ #endif /* _LINUX_HIPPIDEVICE_H */
include/linux/inetdevice.h
View file @ cb178190
...@@ -147,25 +147,27 @@ struct in_ifaddr { ...@@ -147,25 +147,27 @@ struct in_ifaddr {
unsigned long ifa_tstamp; /* updated timestamp */ unsigned long ifa_tstamp; /* updated timestamp */
}; };
extern int register_inetaddr_notifier(struct notifier_block *nb); int register_inetaddr_notifier(struct notifier_block *nb);
extern int unregister_inetaddr_notifier(struct notifier_block *nb); int unregister_inetaddr_notifier(struct notifier_block *nb);
extern void inet_netconf_notify_devconf(struct net *net, int type, int ifindex, void inet_netconf_notify_devconf(struct net *net, int type, int ifindex,
struct ipv4_devconf *devconf); struct ipv4_devconf *devconf);
extern struct net_device *__ip_dev_find(struct net *net, __be32 addr, bool devref); struct net_device *__ip_dev_find(struct net *net, __be32 addr, bool devref);
static inline struct net_device *ip_dev_find(struct net *net, __be32 addr) static inline struct net_device *ip_dev_find(struct net *net, __be32 addr)
{ {
return __ip_dev_find(net, addr, true); return __ip_dev_find(net, addr, true);
} }
extern int inet_addr_onlink(struct in_device *in_dev, __be32 a, __be32 b); int inet_addr_onlink(struct in_device *in_dev, __be32 a, __be32 b);
extern int devinet_ioctl(struct net *net, unsigned int cmd, void __user *); int devinet_ioctl(struct net *net, unsigned int cmd, void __user *);
extern void devinet_init(void); void devinet_init(void);
extern struct in_device *inetdev_by_index(struct net *, int); struct in_device *inetdev_by_index(struct net *, int);
extern __be32 inet_select_addr(const struct net_device *dev, __be32 dst, int scope); __be32 inet_select_addr(const struct net_device *dev, __be32 dst, int scope);
extern __be32 inet_confirm_addr(struct in_device *in_dev, __be32 dst, __be32 local, int scope); __be32 inet_confirm_addr(struct in_device *in_dev, __be32 dst, __be32 local,
extern struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix, __be32 mask); int scope);
struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix,
__be32 mask);
static __inline__ int inet_ifa_match(__be32 addr, struct in_ifaddr *ifa) static __inline__ int inet_ifa_match(__be32 addr, struct in_ifaddr *ifa)
{ {
...@@ -218,7 +220,7 @@ static inline struct in_device *__in_dev_get_rtnl(const struct net_device *dev) ...@@ -218,7 +220,7 @@ static inline struct in_device *__in_dev_get_rtnl(const struct net_device *dev)
return rtnl_dereference(dev->ip_ptr); return rtnl_dereference(dev->ip_ptr);
} }
extern void in_dev_finish_destroy(struct in_device *idev); void in_dev_finish_destroy(struct in_device *idev);
static inline void in_dev_put(struct in_device *idev) static inline void in_dev_put(struct in_device *idev)
{ {
......
include/linux/net.h
View file @ cb178190
...@@ -195,27 +195,23 @@ enum { ...@@ -195,27 +195,23 @@ enum {
SOCK_WAKE_URG, SOCK_WAKE_URG,
}; };
extern int sock_wake_async(struct socket *sk, int how, int band); int sock_wake_async(struct socket *sk, int how, int band);
extern int sock_register(const struct net_proto_family *fam); int sock_register(const struct net_proto_family *fam);
extern void sock_unregister(int family); void sock_unregister(int family);
extern int __sock_create(struct net *net, int family, int type, int proto, int __sock_create(struct net *net, int family, int type, int proto,
struct socket **res, int kern); struct socket **res, int kern);
extern int sock_create(int family, int type, int proto, int sock_create(int family, int type, int proto, struct socket **res);
struct socket **res); int sock_create_kern(int family, int type, int proto, struct socket **res);
extern int sock_create_kern(int family, int type, int proto, int sock_create_lite(int family, int type, int proto, struct socket **res);
struct socket **res); void sock_release(struct socket *sock);
extern int sock_create_lite(int family, int type, int proto, int sock_sendmsg(struct socket *sock, struct msghdr *msg, size_t len);
struct socket **res); int sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
extern void sock_release(struct socket *sock); int flags);
extern int sock_sendmsg(struct socket *sock, struct msghdr *msg, struct file *sock_alloc_file(struct socket *sock, int flags, const char *dname);
size_t len); struct socket *sockfd_lookup(int fd, int *err);
extern int sock_recvmsg(struct socket *sock, struct msghdr *msg, struct socket *sock_from_file(struct file *file, int *err);
size_t size, int flags);
extern struct file *sock_alloc_file(struct socket *sock, int flags, const char *dname);
extern struct socket *sockfd_lookup(int fd, int *err);
extern struct socket *sock_from_file(struct file *file, int *err);
#define sockfd_put(sock) fput(sock->file) #define sockfd_put(sock) fput(sock->file)
extern int net_ratelimit(void); int net_ratelimit(void);
#define net_ratelimited_function(function, ...) \ #define net_ratelimited_function(function, ...) \
do { \ do { \
...@@ -243,32 +239,28 @@ do { \ ...@@ -243,32 +239,28 @@ do { \
#define net_random() prandom_u32() #define net_random() prandom_u32()
#define net_srandom(seed) prandom_seed((__force u32)(seed)) #define net_srandom(seed) prandom_seed((__force u32)(seed))
extern int kernel_sendmsg(struct socket *sock, struct msghdr *msg, int kernel_sendmsg(struct socket *sock, struct msghdr *msg, struct kvec *vec,
struct kvec *vec, size_t num, size_t len); size_t num, size_t len);
extern int kernel_recvmsg(struct socket *sock, struct msghdr *msg, int kernel_recvmsg(struct socket *sock, struct msghdr *msg, struct kvec *vec,
struct kvec *vec, size_t num, size_t num, size_t len, int flags);
size_t len, int flags);
extern int kernel_bind(struct socket *sock, struct sockaddr *addr, int kernel_bind(struct socket *sock, struct sockaddr *addr, int addrlen);
int addrlen); int kernel_listen(struct socket *sock, int backlog);
extern int kernel_listen(struct socket *sock, int backlog); int kernel_accept(struct socket *sock, struct socket **newsock, int flags);
extern int kernel_accept(struct socket *sock, struct socket **newsock, int kernel_connect(struct socket *sock, struct sockaddr *addr, int addrlen,
int flags); int flags);
extern int kernel_connect(struct socket *sock, struct sockaddr *addr, int kernel_getsockname(struct socket *sock, struct sockaddr *addr,
int addrlen, int flags); int *addrlen);
extern int kernel_getsockname(struct socket *sock, struct sockaddr *addr, int kernel_getpeername(struct socket *sock, struct sockaddr *addr,
int *addrlen); int *addrlen);
extern int kernel_getpeername(struct socket *sock, struct sockaddr *addr, int kernel_getsockopt(struct socket *sock, int level, int optname, char *optval,
int *addrlen); int *optlen);
extern int kernel_getsockopt(struct socket *sock, int level, int optname, int kernel_setsockopt(struct socket *sock, int level, int optname, char *optval,
char *optval, int *optlen); unsigned int optlen);
extern int kernel_setsockopt(struct socket *sock, int level, int optname, int kernel_sendpage(struct socket *sock, struct page *page, int offset,
char *optval, unsigned int optlen); size_t size, int flags);
extern int kernel_sendpage(struct socket *sock, struct page *page, int offset, int kernel_sock_ioctl(struct socket *sock, int cmd, unsigned long arg);
size_t size, int flags); int kernel_sock_shutdown(struct socket *sock, enum sock_shutdown_cmd how);
extern int kernel_sock_ioctl(struct socket *sock, int cmd, unsigned long arg);
extern int kernel_sock_shutdown(struct socket *sock,
enum sock_shutdown_cmd how);
#define MODULE_ALIAS_NETPROTO(proto) \ #define MODULE_ALIAS_NETPROTO(proto) \
MODULE_ALIAS("net-pf-" __stringify(proto)) MODULE_ALIAS("net-pf-" __stringify(proto))
......
include/linux/netdevice.h
View file @ cb178190
This diff is collapsed.
include/linux/netfilter.h
View file @ cb178190
...@@ -35,7 +35,7 @@ static inline void nf_inet_addr_mask(const union nf_inet_addr *a1, ...@@ -35,7 +35,7 @@ static inline void nf_inet_addr_mask(const union nf_inet_addr *a1,
result->all[3] = a1->all[3] & mask->all[3]; result->all[3] = a1->all[3] & mask->all[3];
} }
extern int netfilter_init(void); int netfilter_init(void);
/* Largest hook number + 1 */ /* Largest hook number + 1 */
#define NF_MAX_HOOKS 8 #define NF_MAX_HOOKS 8
...@@ -208,7 +208,7 @@ int compat_nf_getsockopt(struct sock *sk, u_int8_t pf, int optval, ...@@ -208,7 +208,7 @@ int compat_nf_getsockopt(struct sock *sk, u_int8_t pf, int optval,
/* Call this before modifying an existing packet: ensures it is /* Call this before modifying an existing packet: ensures it is
modifiable and linear to the point you care about (writable_len). modifiable and linear to the point you care about (writable_len).
Returns true or false. */ Returns true or false. */
extern int skb_make_writable(struct sk_buff *skb, unsigned int writable_len); int skb_make_writable(struct sk_buff *skb, unsigned int writable_len);
struct flowi; struct flowi;
struct nf_queue_entry; struct nf_queue_entry;
...@@ -269,8 +269,8 @@ nf_checksum_partial(struct sk_buff *skb, unsigned int hook, ...@@ -269,8 +269,8 @@ nf_checksum_partial(struct sk_buff *skb, unsigned int hook,
return csum; return csum;
} }
extern int nf_register_afinfo(const struct nf_afinfo *afinfo); int nf_register_afinfo(const struct nf_afinfo *afinfo);
extern void nf_unregister_afinfo(const struct nf_afinfo *afinfo); void nf_unregister_afinfo(const struct nf_afinfo *afinfo);
#include <net/flow.h> #include <net/flow.h>
extern void (*nf_nat_decode_session_hook)(struct sk_buff *, struct flowi *); extern void (*nf_nat_decode_session_hook)(struct sk_buff *, struct flowi *);
...@@ -315,7 +315,7 @@ nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, u_int8_t family) ...@@ -315,7 +315,7 @@ nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, u_int8_t family)
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
extern void (*ip_ct_attach)(struct sk_buff *, const struct sk_buff *) __rcu; extern void (*ip_ct_attach)(struct sk_buff *, const struct sk_buff *) __rcu;
extern void nf_ct_attach(struct sk_buff *, const struct sk_buff *); void nf_ct_attach(struct sk_buff *, const struct sk_buff *);
extern void (*nf_ct_destroy)(struct nf_conntrack *) __rcu; extern void (*nf_ct_destroy)(struct nf_conntrack *) __rcu;
struct nf_conn; struct nf_conn;
......
include/linux/netfilter/nf_conntrack_common.h
View file @ cb178190
...@@ -23,6 +23,6 @@ struct ip_conntrack_stat { ...@@ -23,6 +23,6 @@ struct ip_conntrack_stat {
}; };
/* call to create an explicit dependency on nf_conntrack. */ /* call to create an explicit dependency on nf_conntrack. */
extern void need_conntrack(void); void need_conntrack(void);
#endif /* _NF_CONNTRACK_COMMON_H */ #endif /* _NF_CONNTRACK_COMMON_H */
include/linux/netfilter/nf_conntrack_h323.h
View file @ cb178190
...@@ -29,13 +29,13 @@ struct nf_ct_h323_master { ...@@ -29,13 +29,13 @@ struct nf_ct_h323_master {
struct nf_conn; struct nf_conn;
extern int get_h225_addr(struct nf_conn *ct, unsigned char *data, int get_h225_addr(struct nf_conn *ct, unsigned char *data,
TransportAddress *taddr, TransportAddress *taddr, union nf_inet_addr *addr,
union nf_inet_addr *addr, __be16 *port); __be16 *port);
extern void nf_conntrack_h245_expect(struct nf_conn *new, void nf_conntrack_h245_expect(struct nf_conn *new,
struct nf_conntrack_expect *this); struct nf_conntrack_expect *this);
extern void nf_conntrack_q931_expect(struct nf_conn *new, void nf_conntrack_q931_expect(struct nf_conn *new,
struct nf_conntrack_expect *this); struct nf_conntrack_expect *this);
extern int (*set_h245_addr_hook) (struct sk_buff *skb, unsigned int protoff, extern int (*set_h245_addr_hook) (struct sk_buff *skb, unsigned int protoff,
unsigned char **data, int dataoff, unsigned char **data, int dataoff,
H245_TransportAddress *taddr, H245_TransportAddress *taddr,
......
include/linux/netfilter/nf_conntrack_proto_gre.h
View file @ cb178190
...@@ -87,8 +87,8 @@ int nf_ct_gre_keymap_add(struct nf_conn *ct, enum ip_conntrack_dir dir, ...@@ -87,8 +87,8 @@ int nf_ct_gre_keymap_add(struct nf_conn *ct, enum ip_conntrack_dir dir,
/* delete keymap entries */ /* delete keymap entries */
void nf_ct_gre_keymap_destroy(struct nf_conn *ct); void nf_ct_gre_keymap_destroy(struct nf_conn *ct);
extern void nf_ct_gre_keymap_flush(struct net *net); void nf_ct_gre_keymap_flush(struct net *net);
extern void nf_nat_need_gre(void); void nf_nat_need_gre(void);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _CONNTRACK_PROTO_GRE_H */ #endif /* _CONNTRACK_PROTO_GRE_H */
include/linux/netfilter/nf_conntrack_sip.h
View file @ cb178190
...@@ -157,35 +157,34 @@ extern unsigned int (*nf_nat_sdp_media_hook)(struct sk_buff *skb, ...@@ -157,35 +157,34 @@ extern unsigned int (*nf_nat_sdp_media_hook)(struct sk_buff *skb,
unsigned int medialen, unsigned int medialen,
union nf_inet_addr *rtp_addr); union nf_inet_addr *rtp_addr);
extern int ct_sip_parse_request(const struct nf_conn *ct, int ct_sip_parse_request(const struct nf_conn *ct, const char *dptr,
const char *dptr, unsigned int datalen, unsigned int datalen, unsigned int *matchoff,
unsigned int *matchoff, unsigned int *matchlen, unsigned int *matchlen, union nf_inet_addr *addr,
union nf_inet_addr *addr, __be16 *port); __be16 *port);
extern int ct_sip_get_header(const struct nf_conn *ct, const char *dptr, int ct_sip_get_header(const struct nf_conn *ct, const char *dptr,
unsigned int dataoff, unsigned int datalen, unsigned int dataoff, unsigned int datalen,
enum sip_header_types type, enum sip_header_types type, unsigned int *matchoff,
unsigned int *matchoff, unsigned int *matchlen); unsigned int *matchlen);
extern int ct_sip_parse_header_uri(const struct nf_conn *ct, const char *dptr, int ct_sip_parse_header_uri(const struct nf_conn *ct, const char *dptr,
unsigned int *dataoff, unsigned int datalen, unsigned int *dataoff, unsigned int datalen,
enum sip_header_types type, int *in_header, enum sip_header_types type, int *in_header,
unsigned int *matchoff, unsigned int *matchlen, unsigned int *matchoff, unsigned int *matchlen,
union nf_inet_addr *addr, __be16 *port); union nf_inet_addr *addr, __be16 *port);
extern int ct_sip_parse_address_param(const struct nf_conn *ct, const char *dptr, int ct_sip_parse_address_param(const struct nf_conn *ct, const char *dptr,
unsigned int dataoff, unsigned int datalen, unsigned int dataoff, unsigned int datalen,
const char *name, const char *name, unsigned int *matchoff,
unsigned int *matchoff, unsigned int *matchlen, unsigned int *matchlen, union nf_inet_addr *addr,
union nf_inet_addr *addr, bool delim); bool delim);
extern int ct_sip_parse_numerical_param(const struct nf_conn *ct, const char *dptr, int ct_sip_parse_numerical_param(const struct nf_conn *ct, const char *dptr,
unsigned int off, unsigned int datalen, unsigned int off, unsigned int datalen,
const char *name, const char *name, unsigned int *matchoff,
unsigned int *matchoff, unsigned int *matchen, unsigned int *matchen, unsigned int *val);
unsigned int *val);
int ct_sip_get_sdp_header(const struct nf_conn *ct, const char *dptr,
extern int ct_sip_get_sdp_header(const struct nf_conn *ct, const char *dptr, unsigned int dataoff, unsigned int datalen,
unsigned int dataoff, unsigned int datalen, enum sdp_header_types type,
enum sdp_header_types type, enum sdp_header_types term,
enum sdp_header_types term, unsigned int *matchoff, unsigned int *matchlen);
unsigned int *matchoff, unsigned int *matchlen);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __NF_CONNTRACK_SIP_H__ */ #endif /* __NF_CONNTRACK_SIP_H__ */
include/linux/netfilter/nfnetlink.h
View file @ cb178190
...@@ -25,20 +25,20 @@ struct nfnetlink_subsystem { ...@@ -25,20 +25,20 @@ struct nfnetlink_subsystem {
const struct nfnl_callback *cb; /* callback for individual types */ const struct nfnl_callback *cb; /* callback for individual types */
}; };
extern int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n); int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n);
extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n); int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n);
extern int nfnetlink_has_listeners(struct net *net, unsigned int group); int nfnetlink_has_listeners(struct net *net, unsigned int group);
extern struct sk_buff *nfnetlink_alloc_skb(struct net *net, unsigned int size, struct sk_buff *nfnetlink_alloc_skb(struct net *net, unsigned int size,
u32 dst_portid, gfp_t gfp_mask); u32 dst_portid, gfp_t gfp_mask);
extern int nfnetlink_send(struct sk_buff *skb, struct net *net, u32 portid, int nfnetlink_send(struct sk_buff *skb, struct net *net, u32 portid,
unsigned int group, int echo, gfp_t flags); unsigned int group, int echo, gfp_t flags);
extern int nfnetlink_set_err(struct net *net, u32 portid, u32 group, int error); int nfnetlink_set_err(struct net *net, u32 portid, u32 group, int error);
extern int nfnetlink_unicast(struct sk_buff *skb, struct net *net, int nfnetlink_unicast(struct sk_buff *skb, struct net *net, u32 portid,
u32 portid, int flags); int flags);
extern void nfnl_lock(__u8 subsys_id); void nfnl_lock(__u8 subsys_id);
extern void nfnl_unlock(__u8 subsys_id); void nfnl_unlock(__u8 subsys_id);
#define MODULE_ALIAS_NFNL_SUBSYS(subsys) \ #define MODULE_ALIAS_NFNL_SUBSYS(subsys) \
MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys)) MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys))
......
include/linux/netfilter/nfnetlink_acct.h
View file @ cb178190
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
struct nf_acct; struct nf_acct;
extern struct nf_acct *nfnl_acct_find_get(const char *filter_name); struct nf_acct *nfnl_acct_find_get(const char *filter_name);
extern void nfnl_acct_put(struct nf_acct *acct); void nfnl_acct_put(struct nf_acct *acct);
extern void nfnl_acct_update(const struct sk_buff *skb, struct nf_acct *nfacct); void nfnl_acct_update(const struct sk_buff *skb, struct nf_acct *nfacct);
#endif /* _NFNL_ACCT_H */ #endif /* _NFNL_ACCT_H */
include/linux/netfilter/x_tables.h
View file @ cb178190
...@@ -229,50 +229,48 @@ struct xt_table_info { ...@@ -229,50 +229,48 @@ struct xt_table_info {
#define XT_TABLE_INFO_SZ (offsetof(struct xt_table_info, entries) \ #define XT_TABLE_INFO_SZ (offsetof(struct xt_table_info, entries) \
+ nr_cpu_ids * sizeof(char *)) + nr_cpu_ids * sizeof(char *))
extern int xt_register_target(struct xt_target *target); int xt_register_target(struct xt_target *target);
extern void xt_unregister_target(struct xt_target *target); void xt_unregister_target(struct xt_target *target);
extern int xt_register_targets(struct xt_target *target, unsigned int n); int xt_register_targets(struct xt_target *target, unsigned int n);
extern void xt_unregister_targets(struct xt_target *target, unsigned int n); void xt_unregister_targets(struct xt_target *target, unsigned int n);
extern int xt_register_match(struct xt_match *target); int xt_register_match(struct xt_match *target);
extern void xt_unregister_match(struct xt_match *target); void xt_unregister_match(struct xt_match *target);
extern int xt_register_matches(struct xt_match *match, unsigned int n); int xt_register_matches(struct xt_match *match, unsigned int n);
extern void xt_unregister_matches(struct xt_match *match, unsigned int n); void xt_unregister_matches(struct xt_match *match, unsigned int n);
extern int xt_check_match(struct xt_mtchk_param *, int xt_check_match(struct xt_mtchk_param *, unsigned int size, u_int8_t proto,
unsigned int size, u_int8_t proto, bool inv_proto); bool inv_proto);
extern int xt_check_target(struct xt_tgchk_param *, int xt_check_target(struct xt_tgchk_param *, unsigned int size, u_int8_t proto,
unsigned int size, u_int8_t proto, bool inv_proto); bool inv_proto);
extern struct xt_table *xt_register_table(struct net *net, struct xt_table *xt_register_table(struct net *net,
const struct xt_table *table, const struct xt_table *table,
struct xt_table_info *bootstrap, struct xt_table_info *bootstrap,
struct xt_table_info *newinfo); struct xt_table_info *newinfo);
extern void *xt_unregister_table(struct xt_table *table); void *xt_unregister_table(struct xt_table *table);
extern struct xt_table_info *xt_replace_table(struct xt_table *table, struct xt_table_info *xt_replace_table(struct xt_table *table,
unsigned int num_counters, unsigned int num_counters,
struct xt_table_info *newinfo, struct xt_table_info *newinfo,
int *error); int *error);
extern struct xt_match *xt_find_match(u8 af, const char *name, u8 revision); struct xt_match *xt_find_match(u8 af, const char *name, u8 revision);
extern struct xt_target *xt_find_target(u8 af, const char *name, u8 revision); struct xt_target *xt_find_target(u8 af, const char *name, u8 revision);
extern struct xt_match *xt_request_find_match(u8 af, const char *name, struct xt_match *xt_request_find_match(u8 af, const char *name, u8 revision);
u8 revision); struct xt_target *xt_request_find_target(u8 af, const char *name, u8 revision);
extern struct xt_target *xt_request_find_target(u8 af, const char *name, int xt_find_revision(u8 af, const char *name, u8 revision, int target,
u8 revision); int *err);
extern int xt_find_revision(u8 af, const char *name, u8 revision,
int target, int *err); struct xt_table *xt_find_table_lock(struct net *net, u_int8_t af,
const char *name);
extern struct xt_table *xt_find_table_lock(struct net *net, u_int8_t af, void xt_table_unlock(struct xt_table *t);
const char *name);
extern void xt_table_unlock(struct xt_table *t); int xt_proto_init(struct net *net, u_int8_t af);
void xt_proto_fini(struct net *net, u_int8_t af);
extern int xt_proto_init(struct net *net, u_int8_t af);
extern void xt_proto_fini(struct net *net, u_int8_t af); struct xt_table_info *xt_alloc_table_info(unsigned int size);
void xt_free_table_info(struct xt_table_info *info);
extern struct xt_table_info *xt_alloc_table_info(unsigned int size);
extern void xt_free_table_info(struct xt_table_info *info);
/** /**
* xt_recseq - recursive seqcount for netfilter use * xt_recseq - recursive seqcount for netfilter use
...@@ -353,8 +351,8 @@ static inline unsigned long ifname_compare_aligned(const char *_a, ...@@ -353,8 +351,8 @@ static inline unsigned long ifname_compare_aligned(const char *_a,
return ret; return ret;
} }
extern struct nf_hook_ops *xt_hook_link(const struct xt_table *, nf_hookfn *); struct nf_hook_ops *xt_hook_link(const struct xt_table *, nf_hookfn *);
extern void xt_hook_unlink(const struct xt_table *, struct nf_hook_ops *); void xt_hook_unlink(const struct xt_table *, struct nf_hook_ops *);
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
#include <net/compat.h> #include <net/compat.h>
...@@ -414,25 +412,25 @@ struct _compat_xt_align { ...@@ -414,25 +412,25 @@ struct _compat_xt_align {
#define COMPAT_XT_ALIGN(s) __ALIGN_KERNEL((s), __alignof__(struct _compat_xt_align)) #define COMPAT_XT_ALIGN(s) __ALIGN_KERNEL((s), __alignof__(struct _compat_xt_align))
extern void xt_compat_lock(u_int8_t af); void xt_compat_lock(u_int8_t af);
extern void xt_compat_unlock(u_int8_t af); void xt_compat_unlock(u_int8_t af);
extern int xt_compat_add_offset(u_int8_t af, unsigned int offset, int delta); int xt_compat_add_offset(u_int8_t af, unsigned int offset, int delta);
extern void xt_compat_flush_offsets(u_int8_t af); void xt_compat_flush_offsets(u_int8_t af);
extern void xt_compat_init_offsets(u_int8_t af, unsigned int number); void xt_compat_init_offsets(u_int8_t af, unsigned int number);
extern int xt_compat_calc_jump(u_int8_t af, unsigned int offset); int xt_compat_calc_jump(u_int8_t af, unsigned int offset);
extern int xt_compat_match_offset(const struct xt_match *match); int xt_compat_match_offset(const struct xt_match *match);
extern int xt_compat_match_from_user(struct xt_entry_match *m, int xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr,
void **dstptr, unsigned int *size); unsigned int *size);
extern int xt_compat_match_to_user(const struct xt_entry_match *m, int xt_compat_match_to_user(const struct xt_entry_match *m,
void __user **dstptr, unsigned int *size); void __user **dstptr, unsigned int *size);
extern int xt_compat_target_offset(const struct xt_target *target); int xt_compat_target_offset(const struct xt_target *target);
extern void xt_compat_target_from_user(struct xt_entry_target *t, void xt_compat_target_from_user(struct xt_entry_target *t, void **dstptr,
void **dstptr, unsigned int *size); unsigned int *size);
extern int xt_compat_target_to_user(const struct xt_entry_target *t, int xt_compat_target_to_user(const struct xt_entry_target *t,
void __user **dstptr, unsigned int *size); void __user **dstptr, unsigned int *size);
#endif /* CONFIG_COMPAT */ #endif /* CONFIG_COMPAT */
#endif /* _X_TABLES_H */ #endif /* _X_TABLES_H */
include/linux/netfilter_bridge.h
View file @ cb178190
...@@ -25,7 +25,7 @@ enum nf_br_hook_priorities { ...@@ -25,7 +25,7 @@ enum nf_br_hook_priorities {
#define BRNF_PPPoE 0x20 #define BRNF_PPPoE 0x20
/* Only used in br_forward.c */ /* Only used in br_forward.c */
extern int nf_bridge_copy_header(struct sk_buff *skb); int nf_bridge_copy_header(struct sk_buff *skb);
static inline int nf_bridge_maybe_copy_header(struct sk_buff *skb) static inline int nf_bridge_maybe_copy_header(struct sk_buff *skb)
{ {
if (skb->nf_bridge && if (skb->nf_bridge &&
...@@ -53,7 +53,7 @@ static inline unsigned int nf_bridge_mtu_reduction(const struct sk_buff *skb) ...@@ -53,7 +53,7 @@ static inline unsigned int nf_bridge_mtu_reduction(const struct sk_buff *skb)
return 0; return 0;
} }
extern int br_handle_frame_finish(struct sk_buff *skb); int br_handle_frame_finish(struct sk_buff *skb);
/* Only used in br_device.c */ /* Only used in br_device.c */
static inline int br_nf_pre_routing_finish_bridge_slow(struct sk_buff *skb) static inline int br_nf_pre_routing_finish_bridge_slow(struct sk_buff *skb)
{ {
......
include/linux/netfilter_ipv4.h
View file @ cb178190
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <uapi/linux/netfilter_ipv4.h> #include <uapi/linux/netfilter_ipv4.h>
extern int ip_route_me_harder(struct sk_buff *skb, unsigned addr_type); int ip_route_me_harder(struct sk_buff *skb, unsigned addr_type);
extern __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook, __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook,
unsigned int dataoff, u_int8_t protocol); unsigned int dataoff, u_int8_t protocol);
#endif /*__LINUX_IP_NETFILTER_H*/ #endif /*__LINUX_IP_NETFILTER_H*/
include/linux/netfilter_ipv6.h
View file @ cb178190
...@@ -11,12 +11,12 @@ ...@@ -11,12 +11,12 @@
#ifdef CONFIG_NETFILTER #ifdef CONFIG_NETFILTER
extern int ip6_route_me_harder(struct sk_buff *skb); int ip6_route_me_harder(struct sk_buff *skb);
extern __sum16 nf_ip6_checksum(struct sk_buff *skb, unsigned int hook, __sum16 nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,
unsigned int dataoff, u_int8_t protocol); unsigned int dataoff, u_int8_t protocol);
extern int ipv6_netfilter_init(void); int ipv6_netfilter_init(void);
extern void ipv6_netfilter_fini(void); void ipv6_netfilter_fini(void);
/* /*
* Hook functions for ipv6 to allow xt_* modules to be built-in even * Hook functions for ipv6 to allow xt_* modules to be built-in even
......
include/linux/skbuff.h
View file @ cb178190
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7