diff options
| author | Priit Laes <plaes@plaes.org> | 2012-09-01 09:06:01 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-04 21:30:15 (GMT) |
| commit | 99b2c9d77eaa1f9a52cad4432631c9e7a741ac6b (patch) | |
| tree | 8eb90601d40d4bb2a1ca3bdcb80d7dcc0d4a91d6 /drivers/staging/csr/netdev.c | |
| parent | 96bc8c7ab85b0ed27190a66f05d1677953b8bfb3 (diff) | |
| download | linux-fsl-qoriq-99b2c9d77eaa1f9a52cad4432631c9e7a741ac6b.tar.xz | |
staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.32
Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/csr/netdev.c')
| -rw-r--r-- | drivers/staging/csr/netdev.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/staging/csr/netdev.c b/drivers/staging/csr/netdev.c index 8b46280..371e0a0 100644 --- a/drivers/staging/csr/netdev.c +++ b/drivers/staging/csr/netdev.c @@ -100,17 +100,7 @@ static int uf_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); static int uf_net_stop(struct net_device *dev); static struct net_device_stats *uf_net_get_stats(struct net_device *dev); static u16 uf_net_select_queue(struct net_device *dev, struct sk_buff *skb); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) static netdev_tx_t uf_net_xmit(struct sk_buff *skb, struct net_device *dev); -#else -static int uf_net_xmit(struct sk_buff *skb, struct net_device *dev); -#ifndef NETDEV_TX_OK -#define NETDEV_TX_OK 0 -#endif -#ifndef NETDEV_TX_BUSY -#define NETDEV_TX_BUSY 1 -#endif -#endif static void uf_set_multicast_list(struct net_device *dev); @@ -1792,11 +1782,7 @@ send_ma_pkt_request(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr * The controlled port is handled in the qdisc dequeue handler. * --------------------------------------------------------------------------- */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) static netdev_tx_t -#else -static int -#endif uf_net_xmit(struct sk_buff *skb, struct net_device *dev) { netInterface_priv_t *interfacePriv = (netInterface_priv_t *)netdev_priv(dev); |