lkml.org 
[lkml]   [2012]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/14] staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.32
    Date

    Signed-off-by: Priit Laes <plaes@plaes.org>
    ---
    drivers/staging/csr/netdev.c | 14 --------------
    1 file changed, 14 deletions(-)

    diff --git a/drivers/staging/csr/netdev.c b/drivers/staging/csr/netdev.c
    index 763edfc..52fd5ea 100644
    --- a/drivers/staging/csr/netdev.c
    +++ b/drivers/staging/csr/netdev.c
    @@ -101,17 +101,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);


    @@ -1793,11 +1783,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);
    --
    1.7.12


    \
     
     \ /
      Last update: 2012-09-01 12:01    [W:0.023 / U:59.508 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site