qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 07:51:55 +02:00
Code

[adm5120] fix switch_driver to avoid segfaults

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8071 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2007-07-20 09:07:18 +00:00
parent 547672a7cb
commit 48b7bf6e3d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c
View File

@ -262,7 +262,7 @@ static int adm5120_sw_open(struct net_device *dev)
{ {
unsigned long val; unsigned long val;
int i; int i;
netif_start_queue(dev); netif_start_queue(dev);
if (!adm5120_if_open++) { if (!adm5120_if_open++) {
/* enable interrupts on first open */ /* enable interrupts on first open */
@ -284,7 +284,7 @@ static int adm5120_sw_stop(struct net_device *dev)
{ {
unsigned long val; unsigned long val;
int i; int i;
if (!--adm5120_if_open) { if (!--adm5120_if_open) {
adm5120_set_reg(ADM5120_INT_MASK, ADM5120_INTMASKALL); adm5120_set_reg(ADM5120_INT_MASK, ADM5120_INTMASKALL);
} }
@ -321,7 +321,7 @@ static int adm5120_sw_tx(struct sk_buff *skb, struct net_device *dev)
dma->status = dma->status =
((skb->len<ETH_ZLEN?ETH_ZLEN:skb->len) << ADM5120_DMA_LENSHIFT) | ((skb->len<ETH_ZLEN?ETH_ZLEN:skb->len) << ADM5120_DMA_LENSHIFT) |
(0x1 << priv->port); (0x1 << priv->port);
dma->len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len; dma->len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len;
priv->stats.tx_packets++; priv->stats.tx_packets++;
priv->stats.tx_bytes += skb->len; priv->stats.tx_bytes += skb->len;
@ -554,7 +554,7 @@ static int __init adm5120_sw_init(void)
adm5120_set_reg(ADM5120_RECEIVE_HBADDR, KSEG1ADDR(adm5120_dma_rxh)); adm5120_set_reg(ADM5120_RECEIVE_HBADDR, KSEG1ADDR(adm5120_dma_rxh));
adm5120_set_reg(ADM5120_RECEIVE_LBADDR, KSEG1ADDR(adm5120_dma_rxl)); adm5120_set_reg(ADM5120_RECEIVE_LBADDR, KSEG1ADDR(adm5120_dma_rxl));
for (i=0; i<adm5120_nrdevs; i++) { for (i = 0; i < SW_DEVS; i++) {
adm5120_devs[i] = alloc_etherdev(sizeof(struct adm5120_sw)); adm5120_devs[i] = alloc_etherdev(sizeof(struct adm5120_sw));
if (!adm5120_devs[i]) { if (!adm5120_devs[i]) {
err = -ENOMEM; err = -ENOMEM;
@ -612,9 +612,9 @@ static void __exit adm5120_sw_exit(void)
{ {
int i; int i;
for (i = 0; i < adm5120_nrdevs; i++) { for (i = 0; i < SW_DEVS; i++) {
unregister_netdev(adm5120_devs[i]); unregister_netdev(adm5120_devs[i]);
free_netdev(adm5120_devs[i-1]); free_netdev(adm5120_devs[i]);
} }
free_irq(ADM5120_IRQ_SWITCH, NULL); free_irq(ADM5120_IRQ_SWITCH, NULL);