diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-04-15 22:23:45 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-15 22:23:45 +0200 |
commit | 86cf71b5e0a1b7a9e9be998adf86b4b1cfa9dbac (patch) | |
tree | b56acbea73ccede485d9913263dc69a2fe7c3461 /patches/collateral-evolutions/network | |
parent | c021c0b99ca4f0392046736f4dc2824f400dbdf9 (diff) |
backports: remove useless netdev_tx_t patch
The type netdev_tx_t already gets a typedef to int on old
kernels, so the ifdef in bluetooth code isn't necessary.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/collateral-evolutions/network')
-rw-r--r-- | patches/collateral-evolutions/network/0002-net-misc/bluetooth_bnep.patch | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/patches/collateral-evolutions/network/0002-net-misc/bluetooth_bnep.patch b/patches/collateral-evolutions/network/0002-net-misc/bluetooth_bnep.patch deleted file mode 100644 index 4bebe22e..00000000 --- a/patches/collateral-evolutions/network/0002-net-misc/bluetooth_bnep.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/net/bluetooth/bnep/netdev.c -+++ b/net/bluetooth/bnep/netdev.c -@@ -161,8 +161,12 @@ static int bnep_net_proto_filter(struct - } - #endif - -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) - static netdev_tx_t bnep_net_xmit(struct sk_buff *skb, - struct net_device *dev) -+#else -+static int bnep_net_xmit(struct sk_buff *skb, struct net_device *dev) -+#endif - { - struct bnep_session *s = netdev_priv(dev); - struct sock *sk = s->sock->sk; |