net driver updates
Subsystems (5)
PATCH 1/1 net driver updates
Please pull from 'upstream-davem' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-davem
to receive the following updates:
drivers/net/forcedeth.c | 49 +++++- drivers/net/gianfar_mii.c | 4 +- drivers/net/iseries_veth.c | 2 +- drivers/net/ixgbe/ixgbe.h | 4 +- drivers/net/ixgbe/ixgbe_ethtool.c | 91 +++++++----- drivers/net/ixgbe/ixgbe_main.c | 305 ++++++++++++++++++++++++------------ drivers/net/mv643xx_eth.c | 11 +- drivers/net/sky2.c | 17 +-- drivers/net/sky2.h | 2 +- drivers/net/tlan.c | 25 +++- drivers/net/tulip/xircom_cb.c | 2 +- drivers/net/ucc_geth_mii.c | 4 +- drivers/net/virtio_net.c | 10 +- drivers/net/wan/hdlc.c | 24 +-- drivers/net/wan/hdlc_cisco.c | 5 +- drivers/net/wan/hdlc_fr.c | 53 +++---- drivers/net/wan/hdlc_ppp.c | 2 +- drivers/net/wan/hdlc_raw.c | 2 +- drivers/net/wan/hdlc_raw_eth.c | 6 +- drivers/net/wan/hdlc_x25.c | 10 +- include/linux/hdlc.h | 25 +--- 21 files changed, 398 insertions(+), 255 deletions(-)
Andy Fleming (1):
Fix PHY Lib support for gianfar and ucc_geth
Ayaz Abdulla (3):
forcedeth: restart tx/rx
forcedeth: phy status fix
forcedeth: preserve registers
Ayyappan Veeraiyan (8):
ixgbe: remove obsolete irq_sem, add driver state checking code
ixbge: remove TX lock and redo TX accounting.
ixbge: Make ethtool code account for media types
ixgbe: Fix pause code for ethtool
ixgbe: Fix FW init/release, make this code a function
ixgbe: properly return CHECKSUM_NONE, cleanup csum code
ixgbe: fix several counter register errata
ixgbe: add real-time traffic counters
Byron Bradley (1):
mv643xx_eth: fix byte order when checksum offload is enabled
Christian Borntraeger (1):
virtio net: fix oops on interface-up
Erik Mouw (1):
xircom_cb should return NETDEV_TX_BUSY when no descriptors available
Krzysztof Halasa (3):
Generic HDLC - fix kernel panic
Generic HDLC - remove now unneeded hdlc_device_desc Generic HDLC - use random_ether_addr()
Leonardo Potenza (1):
drivers/net/tlan.c: compilation warning fix
Stephen Hemminger (1):
sky2: fix for Yukon FE (regression in 2.6.25)
Stephen Rothwell (1):
iSeries: fix section mismatch in iseries_veth
drivers/net/forcedeth.c +41 -8
@@ -323,8 +323,8 @@ enum { NvRegMIIStatus = 0x180,#define NVREG_MIISTAT_ERROR 0x0001#define NVREG_MIISTAT_LINKCHANGE 0x0008 -#define NVREG_MIISTAT_MASK 0x000f -#define NVREG_MIISTAT_MASK2 0x000f +#define NVREG_MIISTAT_MASK_RW 0x0007 +#define NVREG_MIISTAT_MASK_ALL 0x000f NvRegMIIMask = 0x184,#define NVREG_MII_LINKCHANGE 0x0008
@@ -624,6 +624,9 @@ union ring_type {#define NV_MSI_X_VECTOR_TX 0x1#define NV_MSI_X_VECTOR_OTHER 0x2 +#define NV_RESTART_TX 0x1 +#define NV_RESTART_RX 0x2 +/* statistics */ struct nv_ethtool_str {char name[ETH_GSTRING_LEN ];
@@ -1061,7 +1064,7 @@ static int mii_rw(struct net_device *dev, int addr, int miireg, int value)u32 reg;int retval; -writel (NVREG_MIISTAT_MASK , base + NvRegMIIStatus); +writel (NVREG_MIISTAT_MASK_RW , base + NvRegMIIStatus); reg =readl (base + NvRegMIIControl);if (reg &NVREG_MIICTL_INUSE ) {
@@ -1432,16 +1435,30 @@ static void nv_mac_reset(struct net_device *dev) {struct fe_priv *np =netdev_priv (dev);u8 __iomem *base =get_hwbase (dev); +u32 temp1, temp2, temp3;dprintk (KERN_DEBUG "%s: nv_mac_reset\n" , dev->name); +writel (NVREG_TXRXCTL_BIT2 |NVREG_TXRXCTL_RESET | np->txrxctl_bits, base + NvRegTxRxControl);pci_push (base); + +/* save registers since they will be cleared on reset */ + temp1 =readl (base + NvRegMacAddrA); + temp2 =readl (base + NvRegMacAddrB); + temp3 =readl (base + NvRegTransmitPoll); +writel (NVREG_MAC_RESET_ASSERT , base + NvRegMacReset);pci_push (base);udelay (NV_MAC_RESET_DELAY );writel (0 , base + NvRegMacReset);pci_push (base);udelay (NV_MAC_RESET_DELAY ); + +/* restore saved registers */ +writel (temp1, base + NvRegMacAddrA); +writel (temp2, base + NvRegMacAddrB); +writel (temp3, base + NvRegTransmitPoll); +writel (NVREG_TXRXCTL_BIT2 | np->txrxctl_bits, base + NvRegTxRxControl);pci_push (base); }
@@ -2767,6 +2784,7 @@ static int nv_update_linkspeed(struct net_device *dev)int mii_status;int retval =0 ;u32 control_1000, status_1000, phyreg, pause_flags, txreg; +u32 txrxFlags =0 ;/* BMSR_LSTATUS is latched, read it twice: * we want the current value.
@@ -2862,6 +2880,16 @@ set_speed: np->duplex = newdup; np->linkspeed = newls; +/* The transmitter and receiver must be restarted for safe update */ +if (readl (base + NvRegTransmitterControl) &NVREG_XMITCTL_START ) { + txrxFlags |=NV_RESTART_TX ; +nv_stop_tx (dev); + } +if (readl (base + NvRegReceiverControl) &NVREG_RCVCTL_START ) { + txrxFlags |=NV_RESTART_RX ; +nv_stop_rx (dev); + } +if (np->gigabit ==PHY_GIGABIT ) { phyreg =readl (base + NvRegRandomSeed); phyreg &= ~(0x3FF00 );
@@ -2950,6 +2978,11 @@ set_speed: }nv_update_pause (dev, pause_flags); +if (txrxFlags &NV_RESTART_TX ) +nv_start_tx (dev); +if (txrxFlags &NV_RESTART_RX ) +nv_start_rx (dev); +return retval; }
@@ -2976,7 +3009,7 @@ static void nv_link_irq(struct net_device *dev)u32 miistat; miistat =readl (base + NvRegMIIStatus); -writel (NVREG_MIISTAT_MASK , base + NvRegMIIStatus); +writel (NVREG_MIISTAT_LINKCHANGE , base + NvRegMIIStatus);dprintk (KERN_INFO "%s: link change irq, status 0x%x.\n" , dev->name, miistat);if (miistat & (NVREG_MIISTAT_LINKCHANGE ))
@@ -4851,7 +4884,7 @@ static int nv_open(struct net_device *dev)writel (0 , base + NvRegMIIMask);writel (NVREG_IRQSTAT_MASK , base + NvRegIrqStatus); -writel (NVREG_MIISTAT_MASK2 , base + NvRegMIIStatus); +writel (NVREG_MIISTAT_MASK_ALL , base + NvRegMIIStatus);writel (NVREG_MISC1_FORCE |NVREG_MISC1_HD , base + NvRegMisc1);writel (readl (base + NvRegTransmitterStatus), base + NvRegTransmitterStatus);
@@ -4889,7 +4922,7 @@ static int nv_open(struct net_device *dev)nv_disable_hw_interrupts (dev, np->irqmask);pci_push (base); -writel (NVREG_MIISTAT_MASK2 , base + NvRegMIIStatus); +writel (NVREG_MIISTAT_MASK_ALL , base + NvRegMIIStatus);writel (NVREG_IRQSTAT_MASK , base + NvRegIrqStatus);pci_push (base);
@@ -4912,7 +4945,7 @@ static int nv_open(struct net_device *dev) {u32 miistat; miistat =readl (base + NvRegMIIStatus); -writel (NVREG_MIISTAT_MASK , base + NvRegMIIStatus); +writel (NVREG_MIISTAT_MASK_ALL , base + NvRegMIIStatus);dprintk (KERN_INFO "startup: got 0x%08x.\n" , miistat); }/* set linkspeed to invalid value, thus force nv_update_linkspeed
@@ -5280,7 +5313,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i phystate &= ~NVREG_ADAPTCTL_RUNNING ;writel (phystate, base + NvRegAdapterControl); } -writel (NVREG_MIISTAT_MASK , base + NvRegMIIStatus); +writel (NVREG_MIISTAT_MASK_ALL , base + NvRegMIIStatus);if (id->driver_data &DEV_HAS_MGMT_UNIT ) {/* management unit running on the mac? */
drivers/net/gianfar_mii.c +2 -2
@@ -127,7 +127,7 @@ int gfar_mdio_reset(struct mii_bus *bus)struct gfar_mii __iomem *regs = (void __iomem *)bus->priv;unsigned int timeout =PHY_INIT_TIMEOUT ; -spin_lock_bh (&bus->mdio_lock); +mutex_lock (&bus->mdio_lock);/* Reset the management interface */ gfar_write (®s->miimcfg,MIIMCFG_RESET );
@@ -140,7 +140,7 @@ int gfar_mdio_reset(struct mii_bus *bus) timeout--)cpu_relax (); -spin_unlock_bh (&bus->mdio_lock); +mutex_unlock (&bus->mdio_lock);if (timeout <=0 ) { printk(KERN_ERR "%s: The MII Bus is stuck!\n",
drivers/net/iseries_veth.c +1 -1
@@ -1020,7 +1020,7 @@ static const struct ethtool_ops ops = { .get_link = veth_get_link, }; -static struct net_device *__init veth_probe_one (int vlan, +static struct net_device *veth_probe_one (int vlan,struct vio_dev *vio_dev) {struct net_device *dev;
drivers/net/ixgbe/ixgbe.h +1 -3
@@ -136,8 +136,6 @@ struct ixgbe_ring {u16 head;u16 tail; -/* To protect race between sender and clean_tx_irq */ -spinlock_t tx_lock;struct ixgbe_queue_stats stats;
@@ -174,7 +172,6 @@ struct ixgbe_adapter {struct vlan_group *vlgrp;u16 bd_number;u16 rx_buf_len; -atomic_t irq_sem;struct work_struct reset_task;/* TX */
@@ -244,6 +241,7 @@ extern const char ixgbe_driver_version[];extern int ixgbe_up (struct ixgbe_adapter *adapter);extern void ixgbe_down (struct ixgbe_adapter *adapter); +extern void ixgbe_reinit_locked (struct ixgbe_adapter *adapter);extern void ixgbe_reset (struct ixgbe_adapter *adapter);extern void ixgbe_update_stats (struct ixgbe_adapter *adapter);extern void ixgbe_set_ethtool_ops (struct net_device *netdev);
drivers/net/ixgbe/ixgbe_ethtool.c +54 -37
160 lines not on this page · raw message
drivers/net/ixgbe/ixgbe_main.c +203 -102
594 lines not on this page · raw message
drivers/net/mv643xx_eth.c +8 -3
@@ -1652,6 +1652,11 @@ static void eth_tx_fill_frag_descs(struct mv643xx_private *mp, } } +static inline __be16 sum16_as_be (__sum16 sum) +{ +return (__force __be16 )sum; +} +/** * eth_tx_submit_descs_for_skb - submit data from an skb to the tx hw *
@@ -1689,7 +1694,7 @@ static void eth_tx_submit_descs_for_skb(struct mv643xx_private *mp, desc->buf_ptr =dma_map_single (NULL , skb->data, length,DMA_TO_DEVICE );if (skb->ip_summed ==CHECKSUM_PARTIAL ) { -BUG_ON (skb->protocol !=ETH_P_IP ); +BUG_ON (skb->protocol !=htons (ETH_P_IP )); cmd_sts |=ETH_GEN_TCP_UDP_CHECKSUM | ETH_GEN_IP_V_4_CHECKSUM |
@@ -1698,10 +1703,10 @@ static void eth_tx_submit_descs_for_skb(struct mv643xx_private *mp,switch (ip_hdr (skb)->protocol) {case IPPROTO_UDP : cmd_sts |=ETH_UDP_FRAME ; - desc->l4i_chk =udp_hdr (skb)->check; + desc->l4i_chk =ntohs (sum16_as_be (udp_hdr (skb)->check));break ;case IPPROTO_TCP : - desc->l4i_chk =tcp_hdr (skb)->check; + desc->l4i_chk =ntohs (sum16_as_be (tcp_hdr (skb)->check));break ;default :BUG ();
drivers/net/sky2.c +7 -10
@@ -857,7 +857,7 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)sky2_write16 (hw,SK_REG (port,TX_GMF_CTRL_T ),GMF_OPER_ON );/* On chips without ram buffer, pause is controled by MAC level */ -if (sky2_read8 (hw,B2_E_0 ) ==0 ) { +if (!(hw->flags &SKY2_HW_RAM_BUFFER )) {sky2_write8 (hw,SK_REG (port,RX_GMF_LP_THR ),768 /8 );sky2_write8 (hw,SK_REG (port,RX_GMF_UP_THR ),1024 /8 );
@@ -1194,7 +1194,7 @@ static struct sk_buff *sky2_rx_alloc(struct sky2_port *sky2)struct sk_buff *skb;int i; -if (sky2->hw->flags &SKY2_HW_FIFO_HANG_CHECK ) { +if (sky2->hw->flags &SKY2_HW_RAM_BUFFER ) {unsigned char *start;/* * Workaround for a bug in FIFO that cause hang
@@ -1387,6 +1387,7 @@ static int sky2_up(struct net_device *dev)if (ramsize >0 ) {u32 rxspace; + hw->flags |=SKY2_HW_RAM_BUFFER ;pr_debug (PFX "%s: ram buffer %dK\n" , dev->name, ramsize);if (ramsize <16 ) rxspace = ramsize /2 ;
@@ -2026,7 +2027,7 @@ static int sky2_change_mtu(struct net_device *dev, int new_mtu)synchronize_irq (hw->pdev->irq); -if (sky2_read8 (hw,B2_E_0 ) ==0 ) +if (!(hw->flags &SKY2_HW_RAM_BUFFER ))sky2_set_tx_stfwd (hw, port); ctl =gma_read16 (hw, port,GM_GP_CTRL );
@@ -2566,7 +2567,7 @@ static void sky2_watchdog(unsigned long arg) ++active;/* For chips with Rx FIFO, check if stuck */ -if ((hw->flags &SKY2_HW_FIFO_HANG_CHECK ) && +if ((hw->flags &SKY2_HW_RAM_BUFFER ) &&sky2_rx_hung (dev)) {pr_info (PFX "%s: receiver hang detected\n" , dev->name);
@@ -2722,11 +2723,7 @@ static int __devinit sky2_init(struct sky2_hw *hw)switch (hw->chip_id) {case CHIP_ID_YUKON_XL : - hw->flags =SKY2_HW_GIGABIT - |SKY2_HW_NEWER_PHY ; -if (hw->chip_rev <3 ) - hw->flags |=SKY2_HW_FIFO_HANG_CHECK ; - + hw->flags =SKY2_HW_GIGABIT |SKY2_HW_NEWER_PHY ;break ;case CHIP_ID_YUKON_EC_U :
@@ -2752,7 +2749,7 @@ static int __devinit sky2_init(struct sky2_hw *hw)dev_err (&hw->pdev->dev,"unsupported revision Yukon-EC rev A1\n" );return -EOPNOTSUPP ; } - hw->flags =SKY2_HW_GIGABIT |SKY2_HW_FIFO_HANG_CHECK ; + hw->flags =SKY2_HW_GIGABIT ;break ;case CHIP_ID_YUKON_FE :
drivers/net/sky2.h +1 -1
@@ -2045,7 +2045,7 @@ struct sky2_hw {#define SKY2_HW_FIBRE_PHY 0x00000002#define SKY2_HW_GIGABIT 0x00000004#define SKY2_HW_NEWER_PHY 0x00000008 -#define SKY2_HW_FIFO_HANG_CHECK 0x00000010 +#define SKY2_HW_RAM_BUFFER 0x00000010#define SKY2_HW_NEW_LE 0x00000020/* new LSOv2 format */ #define SKY2_HW_AUTO_TX_SUM 0x00000040/* new IP decode for Tx */ #define SKY2_HW_ADV_POWER_CTL 0x00000080/* additional PHY power regs */
drivers/net/tlan.c +18 -7
@@ -465,7 +465,7 @@ static struct pci_driver tlan_driver = {static int __init tlan_probe (void ) { -static int pad_allocated; +int rc = -ENODEV ;printk (KERN_INFO "%s" , tlan_banner);
@@ -473,17 +473,22 @@ static int __init tlan_probe(void)if (TLanPadBuffer ==NULL ) {printk (KERN_ERR "TLAN: Could not allocate memory for pad buffer.\n" ); -return -ENOMEM ; + rc = -ENOMEM ; + goto err_out; }memset (TLanPadBuffer,0 ,TLAN_MIN_FRAME_SIZE ); - pad_allocated =1 ;TLAN_DBG (TLAN_DEBUG_PROBE ,"Starting PCI Probe....\n" );/* Use new style PCI probing. Now the kernel will do most of this for us */ -pci_register_driver (&tlan_driver); + rc =pci_register_driver (&tlan_driver); + +if (rc !=0 ) { +printk (KERN_ERR "TLAN: Could not register pci driver.\n" ); + goto err_out_pci_free; + }TLAN_DBG (TLAN_DEBUG_PROBE ,"Starting EISA Probe....\n" );TLan_EisaProbe ();
@@ -493,11 +498,17 @@ static int __init tlan_probe(void) tlan_have_pci, tlan_have_eisa);if (TLanDevicesInstalled ==0 ) { -pci_unregister_driver (&tlan_driver); -pci_free_consistent (NULL ,TLAN_MIN_FRAME_SIZE , TLanPadBuffer, TLanPadBufferDMA); -return -ENODEV ; + rc = -ENODEV ; + goto err_out_pci_unreg; }return 0 ; + +err_out_pci_unreg: +pci_unregister_driver (&tlan_driver); +err_out_pci_free: +pci_free_consistent (NULL ,TLAN_MIN_FRAME_SIZE , TLanPadBuffer, TLanPadBufferDMA); +err_out: +return rc; }
drivers/net/tulip/xircom_cb.c +1 -1
@@ -441,7 +441,7 @@ static int xircom_start_xmit(struct sk_buff *skb, struct net_device *dev)spin_unlock_irqrestore (&card->lock,flags);trigger_transmit (card); -return -EIO ; +return NETDEV_TX_BUSY ; }
drivers/net/ucc_geth_mii.c +2 -2
@@ -109,7 +109,7 @@ int uec_mdio_reset(struct mii_bus *bus)struct ucc_mii_mng __iomem *regs = (void __iomem *)bus->priv;unsigned int timeout =PHY_INIT_TIMEOUT ; -spin_lock_bh (&bus->mdio_lock); +mutex_lock (&bus->mdio_lock);/* Reset the management interface */ out_be32 (®s->miimcfg,MIIMCFG_RESET_MANAGEMENT );
@@ -121,7 +121,7 @@ int uec_mdio_reset(struct mii_bus *bus)while ((in_be32 (®s->miimind) &MIIMIND_BUSY ) && timeout--)cpu_relax (); -spin_unlock_bh (&bus->mdio_lock); +mutex_unlock (&bus->mdio_lock);if (timeout <=0 ) {printk (KERN_ERR "%s: The MII Bus is stuck!\n" , bus->name);
drivers/net/virtio_net.c +6 -4
@@ -302,10 +302,12 @@ static int virtnet_open(struct net_device *dev)/* If all buffers were filled by other side before we napi_enabled, we * won't get another interrupt, so process any outstanding packets -* now. virtnet_poll wants re-enable the queue, so we disable here. */ - vi->rvq->vq_ops->disable_cb (vi->rvq); -netif_rx_schedule (vi->dev, &vi->napi); - +* now. virtnet_poll wants re-enable the queue, so we disable here. +* We synchronize against interrupts via NAPI_STATE_SCHED */ +if (netif_rx_schedule_prep (dev, &vi->napi)) { + vi->rvq->vq_ops->disable_cb (vi->rvq); +__netif_rx_schedule (dev, &vi->napi); + }return 0 ; }
drivers/net/wan/hdlc.c +9 -15
@@ -1,7 +1,7 @@/* * Generic HDLC support routines for Linux * -* Copyright (C) 1999 - 2006 Krzysztof Halasa <[email protected]> +* Copyright (C) 1999 - 2008 Krzysztof Halasa <[email protected]> * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License
@@ -39,7 +39,7 @@#include <net/net_namespace.h> -static const char * version ="HDLC support module revision 1.21" ; +static const char * version ="HDLC support module revision 1.22" ;#undef DEBUG_LINK
@@ -66,19 +66,15 @@ static struct net_device_stats *hdlc_get_stats(struct net_device *dev)static int hdlc_rcv (struct sk_buff *skb,struct net_device *dev,struct packet_type *p,struct net_device *orig_dev) { -struct hdlc_device_desc *desc =dev_to_desc (dev); +struct hdlc_device *hdlc =dev_to_hdlc (dev);if (dev->nd_net != &init_net) {kfree_skb (skb);return 0 ; } -if (desc->netif_rx) -return desc->netif_rx (skb); - - desc->stats.rx_dropped++;/* Shouldn't happen */ -dev_kfree_skb (skb); -return NET_RX_DROP ; +BUG_ON (!hdlc->proto->netif_rx); +return hdlc->proto->netif_rx (skb); }
@@ -87,7 +83,7 @@ static inline void hdlc_proto_start(struct net_device *dev) {hdlc_device *hdlc =dev_to_hdlc (dev);if (hdlc->proto->start) -return hdlc->proto->start (dev); + hdlc->proto->start (dev); }
@@ -96,7 +92,7 @@ static inline void hdlc_proto_stop(struct net_device *dev) {hdlc_device *hdlc =dev_to_hdlc (dev);if (hdlc->proto->stop) -return hdlc->proto->stop (dev); + hdlc->proto->stop (dev); }
@@ -263,8 +259,7 @@ static void hdlc_setup(struct net_device *dev)struct net_device *alloc_hdlcdev (void *priv) {struct net_device *dev; - dev =alloc_netdev (sizeof (struct hdlc_device_desc ) + -sizeof (hdlc_device),"hdlc%d" , hdlc_setup); + dev =alloc_netdev (sizeof (struct hdlc_device ),"hdlc%d" , hdlc_setup);if (dev)dev_to_hdlc (dev)->priv = priv;return dev;
@@ -281,7 +276,7 @@ void unregister_hdlc_device(struct net_device *dev)int attach_hdlc_protocol (struct net_device *dev,struct hdlc_proto *proto, -int (*rx)(struct sk_buff *skb),size_t size) +size_t size) {detach_hdlc_protocol (dev);
@@ -297,7 +292,6 @@ int attach_hdlc_protocol(struct net_device *dev, struct hdlc_proto *proto,return -ENOBUFS ; }dev_to_hdlc (dev)->proto = proto; -dev_to_desc (dev)->netif_rx = rx;return 0 ; }
drivers/net/wan/hdlc_cisco.c +3 -2
@@ -250,7 +250,7 @@ static int cisco_rx(struct sk_buff *skb)return NET_RX_DROP ; rx_error: -dev_to_desc (dev)->stats.rx_errors++;/* Mark error */ +dev_to_hdlc (dev)->stats.rx_errors++;/* Mark error */ dev_kfree_skb_any (skb);return NET_RX_DROP ; }
@@ -314,6 +314,7 @@ static struct hdlc_proto proto = { .stop = cisco_stop, .type_trans = cisco_type_trans, .ioctl = cisco_ioctl, + .netif_rx = cisco_rx, .module = THIS_MODULE, };
@@ -360,7 +361,7 @@ static int cisco_ioctl(struct net_device *dev, struct ifreq *ifr)if (result)return result; - result =attach_hdlc_protocol (dev, &proto, cisco_rx, + result =attach_hdlc_protocol (dev, &proto,sizeof (struct cisco_state ));if (result)return result;
drivers/net/wan/hdlc_fr.c +25 -28
148 lines not on this page · raw message
drivers/net/wan/hdlc_ppp.c +1 -1
@@ -122,7 +122,7 @@ static int ppp_ioctl(struct net_device *dev, struct ifreq *ifr)if (result)return result; - result =attach_hdlc_protocol (dev, &proto,NULL , + result =attach_hdlc_protocol (dev, &proto,sizeof (struct ppp_state ));if (result)return result;
drivers/net/wan/hdlc_raw.c +1 -1
@@ -82,7 +82,7 @@ static int raw_ioctl(struct net_device *dev, struct ifreq *ifr)if (result)return result; - result =attach_hdlc_protocol (dev, &proto,NULL , + result =attach_hdlc_protocol (dev, &proto,sizeof (raw_hdlc_proto));if (result)return result;
drivers/net/wan/hdlc_raw_eth.c +2 -4
@@ -18,7 +18,6 @@#include <linux/init.h> #include <linux/skbuff.h> #include <linux/pkt_sched.h> -#include <linux/random.h> #include <linux/inetdevice.h> #include <linux/lapb.h> #include <linux/rtnetlink.h>
@@ -96,7 +95,7 @@ static int raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr)if (result)return result; - result =attach_hdlc_protocol (dev, &proto,NULL , + result =attach_hdlc_protocol (dev, &proto,sizeof (raw_hdlc_proto));if (result)return result;
@@ -107,8 +106,7 @@ static int raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr)ether_setup (dev); dev->change_mtu = old_ch_mtu; dev->tx_queue_len = old_qlen; -memcpy (dev->dev_addr,"\x00\x01" ,2 ); -get_random_bytes (dev->dev_addr +2 ,ETH_ALEN -2 ); +random_ether_addr (dev->dev_addr);netif_dormant_off (dev);return 0 ; }
drivers/net/wan/hdlc_x25.c +5 -5
@@ -164,17 +164,17 @@ static void x25_close(struct net_device *dev)static int x25_rx (struct sk_buff *skb) { -struct hdlc_device_desc *desc =dev_to_desc (skb->dev); +struct hdlc_device *hdlc =dev_to_hdlc (skb->dev);if ((skb =skb_share_check (skb,GFP_ATOMIC )) ==NULL ) { - desc->stats.rx_dropped++; + hdlc->stats.rx_dropped++;return NET_RX_DROP ; }if (lapb_data_received (skb->dev, skb) ==LAPB_OK )return NET_RX_SUCCESS ; - desc->stats.rx_errors++; + hdlc->stats.rx_errors++;dev_kfree_skb_any (skb);return NET_RX_DROP ; }
@@ -184,6 +184,7 @@ static struct hdlc_proto proto = { .open = x25_open, .close = x25_close, .ioctl = x25_ioctl, + .netif_rx = x25_rx, .module = THIS_MODULE, };
@@ -211,8 +212,7 @@ static int x25_ioctl(struct net_device *dev, struct ifreq *ifr)if (result)return result; -if ((result =attach_hdlc_protocol (dev, &proto, - x25_rx,0 )) !=0 ) +if ((result =attach_hdlc_protocol (dev, &proto,0 )))return result; dev->hard_start_xmit = x25_xmit; dev->type =ARPHRD_X25 ;
include/linux/hdlc.h +7 -18
@@ -26,13 +26,6 @@#include <linux/netdevice.h> #include <linux/hdlc/ioctl.h> - -/* Used by all network devices here, pointed to by netdev_priv(dev) */ -struct hdlc_device_desc { -int (*netif_rx)(struct sk_buff *skb); -struct net_device_stats stats; -}; -/* This structure is a private property of HDLC protocols. Hardware drivers have no interest here */
@@ -44,12 +37,15 @@ struct hdlc_proto {void (*detach)(struct net_device *dev);int (*ioctl)(struct net_device *dev,struct ifreq *ifr);__be16 (*type_trans)(struct sk_buff *skb,struct net_device *dev); +int (*netif_rx)(struct sk_buff *skb);struct module *module;struct hdlc_proto *next;/* next protocol in the list */ }; +/* Pointed to by dev->priv */ typedef struct hdlc_device { + struct net_device_stats stats; /* used by HDLC layer to take control over HDLC device from hw driver*/ int (*attach)(struct net_device *dev, unsigned short encoding, unsigned short parity);
@@ -83,18 +79,11 @@ void unregister_hdlc_protocol(struct hdlc_proto *proto);struct net_device *alloc_hdlcdev (void *priv); - -static __inline__struct hdlc_device_desc *dev_to_desc (struct net_device *dev) -{ -return netdev_priv (dev); -} - -static __inline__hdlc_device *dev_to_hdlc (struct net_device *dev) +static inline struct hdlc_device *dev_to_hdlc (struct net_device *dev) { -return netdev_priv (dev) +sizeof (struct hdlc_device_desc ); +return dev->priv; } -static __inline__void debug_frame (const struct sk_buff *skb) {int i;
@@ -116,13 +105,13 @@ int hdlc_open(struct net_device *dev);void hdlc_close (struct net_device *dev);int attach_hdlc_protocol (struct net_device *dev,struct hdlc_proto *proto, -int (*rx)(struct sk_buff *skb),size_t size); +size_t size);/* May be used by hardware driver to gain control over HDLC device */ void detach_hdlc_protocol (struct net_device *dev);static __inline__struct net_device_stats *hdlc_stats (struct net_device *dev) { -return &dev_to_desc (dev)->stats; +return &dev_to_hdlc (dev)->stats; }
David Miller
maintainerFrom: Jeff Garzik <[email protected]>
Date: Wed, 6 Feb 2008 06:49:50 -0500
Quoted 4 lines
Please pull from 'upstream-davem' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-davem
to receive the following updates:
Pulled, thanks Jeff.