lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 20 Sep 2007 22:04:59 -0400 From: jfannin@...il.com (Joseph Fannin) To: Stephen Hemminger <shemminger@...ux-foundation.org>, "David S. Miller" <davem@...emloft.net> Cc: Andrew Morton <akpm@...ux-foundation.org>, Joseph Fannin <jfannin@...il.com>, linux-kernel@...r.kernel.org Subject: [PATCH] make mv643xx_eth.c build again The changeset to "Make NAPI polling independent of struct net_device objects" forgot to change a function prototype in mv643xx_eth.c, and also introduced a typo that caused the driver not to build. Signed-off-by: Joseph Fannin <jfannin@...il.com> --- This is build-tested only. diff -ru linux-2.6.23-rc6-mm1.orig/drivers/net/mv643xx_eth.c linux-2.6.23-rc6-mm1/drivers/net/mv643xx_eth.c --- linux-2.6.23-rc6-mm1.orig/drivers/net/mv643xx_eth.c 2007-09-20 18:17:41.000000000 -0400 +++ linux-2.6.23-rc6-mm1/drivers/net/mv643xx_eth.c 2007-09-20 18:17:11.000000000 -0400 @@ -65,7 +65,7 @@ static int mv643xx_eth_change_mtu(struct net_device *, int); static void eth_port_init_mac_tables(unsigned int eth_port_num); #ifdef MV643XX_NAPI -static int mv643xx_poll(struct net_device *dev, int budget); +static int mv643xx_poll(struct napi_struct *napi, int budget); #endif static int ethernet_phy_get(unsigned int eth_port_num); static void ethernet_phy_set(unsigned int eth_port_num, int phy_addr); @@ -561,7 +561,7 @@ /* wait for previous write to complete */ mv_read(MV643XX_ETH_INTERRUPT_MASK_REG(port_num)); - netif_rx_schedule(dev, &bp->napi); + netif_rx_schedule(dev, &mp->napi); } #else if (eth_int_cause & ETH_INT_CAUSE_RX) -- Joseph Fannin jfannin@...il.com - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists