diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-12-14 20:29:00 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-12-14 20:31:16 +0100 |
| commit | a4ec80082c82f3fda775d13b2a72aac38248ced6 (patch) | |
| tree | 23affbe49c629cbbdb5553ca78aa444a7ccf2ead /drivers/net/wireless/marvell/libertas/debugfs.h | |
| parent | 19576c9478682a398276c994ea0d2696474df32b (diff) | |
| parent | cb4396edd84ed73081635fb933d19c1410fafaf4 (diff) | |
| download | op-kernel-dev-a4ec80082c82f3fda775d13b2a72aac38248ced6.zip op-kernel-dev-a4ec80082c82f3fda775d13b2a72aac38248ced6.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Resolve conflict between commit 264640fc2c5f4f ("ipv6: distinguish frag
queues by device for multicast and link-local packets") from the net
tree and commit 029f7f3b8701c ("netfilter: ipv6: nf_defrag: avoid/free
clone operations") from the nf-next tree.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Conflicts:
net/ipv6/netfilter/nf_conntrack_reasm.c
Diffstat (limited to 'drivers/net/wireless/marvell/libertas/debugfs.h')
| -rw-r--r-- | drivers/net/wireless/marvell/libertas/debugfs.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/wireless/marvell/libertas/debugfs.h b/drivers/net/wireless/marvell/libertas/debugfs.h new file mode 100644 index 0000000..f2b9c7f --- /dev/null +++ b/drivers/net/wireless/marvell/libertas/debugfs.h @@ -0,0 +1,10 @@ +#ifndef _LBS_DEBUGFS_H_ +#define _LBS_DEBUGFS_H_ + +void lbs_debugfs_init(void); +void lbs_debugfs_remove(void); + +void lbs_debugfs_init_one(struct lbs_private *priv, struct net_device *dev); +void lbs_debugfs_remove_one(struct lbs_private *priv); + +#endif |
