Skip to content

Commit

Permalink
netdevice pc300: Convert directly reference of netdev->priv
Browse files Browse the repository at this point in the history
netdev's private data should be hdlc.
pc300dev_t is the private data of hdlc.

Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Wang Chen authored and David S. Miller committed Nov 22, 2008
1 parent 2baf8a2 commit 6636e11
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions drivers/net/wan/pc300_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -1769,7 +1769,7 @@ cpc_trace(struct net_device *dev, struct sk_buff *skb_main, char rx_tx)

static void cpc_tx_timeout(struct net_device *dev)
{
pc300dev_t *d = (pc300dev_t *) dev->priv;
pc300dev_t *d = (pc300dev_t *) dev_to_hdlc(dev)->priv;
pc300ch_t *chan = (pc300ch_t *) d->chan;
pc300_t *card = (pc300_t *) chan->card;
int ch = chan->channel;
Expand All @@ -1796,7 +1796,7 @@ static void cpc_tx_timeout(struct net_device *dev)

static int cpc_queue_xmit(struct sk_buff *skb, struct net_device *dev)
{
pc300dev_t *d = (pc300dev_t *) dev->priv;
pc300dev_t *d = (pc300dev_t *) dev_to_hdlc(dev)->priv;
pc300ch_t *chan = (pc300ch_t *) d->chan;
pc300_t *card = (pc300_t *) chan->card;
int ch = chan->channel;
Expand Down Expand Up @@ -1874,7 +1874,7 @@ static int cpc_queue_xmit(struct sk_buff *skb, struct net_device *dev)

static void cpc_net_rx(struct net_device *dev)
{
pc300dev_t *d = (pc300dev_t *) dev->priv;
pc300dev_t *d = (pc300dev_t *) dev_to_hdlc(dev)->priv;
pc300ch_t *chan = (pc300ch_t *) d->chan;
pc300_t *card = (pc300_t *) chan->card;
int ch = chan->channel;
Expand Down Expand Up @@ -2522,7 +2522,7 @@ static int cpc_change_mtu(struct net_device *dev, int new_mtu)

static int cpc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
pc300dev_t *d = (pc300dev_t *) dev->priv;
pc300dev_t *d = (pc300dev_t *) dev_to_hdlc(dev)->priv;
pc300ch_t *chan = (pc300ch_t *) d->chan;
pc300_t *card = (pc300_t *) chan->card;
pc300conf_t conf_aux;
Expand Down Expand Up @@ -3058,7 +3058,7 @@ static int tx_config(pc300dev_t * d)
static int cpc_attach(struct net_device *dev, unsigned short encoding,
unsigned short parity)
{
pc300dev_t *d = (pc300dev_t *)dev->priv;
pc300dev_t *d = (pc300dev_t *)dev_to_hdlc(dev)->priv;
pc300ch_t *chan = (pc300ch_t *)d->chan;
pc300_t *card = (pc300_t *)chan->card;
pc300chconf_t *conf = (pc300chconf_t *)&chan->conf;
Expand Down Expand Up @@ -3138,7 +3138,7 @@ static void cpc_closech(pc300dev_t * d)

int cpc_open(struct net_device *dev)
{
pc300dev_t *d = (pc300dev_t *) dev->priv;
pc300dev_t *d = (pc300dev_t *) dev_to_hdlc(dev)->priv;
struct ifreq ifr;
int result;

Expand Down Expand Up @@ -3166,7 +3166,7 @@ int cpc_open(struct net_device *dev)

static int cpc_close(struct net_device *dev)
{
pc300dev_t *d = (pc300dev_t *) dev->priv;
pc300dev_t *d = (pc300dev_t *) dev_to_hdlc(dev)->priv;
pc300ch_t *chan = (pc300ch_t *) d->chan;
pc300_t *card = (pc300_t *) chan->card;
unsigned long flags;
Expand Down Expand Up @@ -3347,7 +3347,7 @@ static void cpc_init_card(pc300_t * card)
d->line_on = 0;
d->line_off = 0;

dev = alloc_hdlcdev(NULL);
dev = alloc_hdlcdev(d);
if (dev == NULL)
continue;

Expand All @@ -3372,7 +3372,6 @@ static void cpc_init_card(pc300_t * card)
dev->do_ioctl = cpc_ioctl;

if (register_hdlc_device(dev) == 0) {
dev->priv = d; /* We need 'priv', hdlc doesn't */
printk("%s: Cyclades-PC300/", dev->name);
switch (card->hw.type) {
case PC300_TE:
Expand Down

0 comments on commit 6636e11

Please sign in to comment.