git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
net
/
cris
/
eth_v10.c
diff --git
a/drivers/net/cris/eth_v10.c
b/drivers/net/cris/eth_v10.c
index
64105e4
..
a03d781
100644
(file)
--- a/
drivers/net/cris/eth_v10.c
+++ b/
drivers/net/cris/eth_v10.c
@@
-218,7
+218,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/module.h>
@@
-404,8
+403,8
@@
static int etrax_ethernet_init(void);
static int e100_open(struct net_device *dev);
static int e100_set_mac_address(struct net_device *dev, void *addr);
static int e100_send_packet(struct sk_buff *skb, struct net_device *dev);
static int e100_open(struct net_device *dev);
static int e100_set_mac_address(struct net_device *dev, void *addr);
static int e100_send_packet(struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t e100rxtx_interrupt(int irq, void *dev_id
, struct pt_regs *regs
);
-static irqreturn_t e100nw_interrupt(int irq, void *dev_id
, struct pt_regs *regs
);
+static irqreturn_t e100rxtx_interrupt(int irq, void *dev_id);
+static irqreturn_t e100nw_interrupt(int irq, void *dev_id);
static void e100_rx(struct net_device *dev);
static int e100_close(struct net_device *dev);
static int e100_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
static void e100_rx(struct net_device *dev);
static int e100_close(struct net_device *dev);
static int e100_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
@@
-435,7
+434,7
@@
static void e100_reset_transceiver(struct net_device* net);
static void e100_clear_network_leds(unsigned long dummy);
static void e100_set_network_leds(int active);
static void e100_clear_network_leds(unsigned long dummy);
static void e100_set_network_leds(int active);
-static struct ethtool_ops e100_ethtool_ops;
+static
const
struct ethtool_ops e100_ethtool_ops;
static void broadcom_check_speed(struct net_device* dev);
static void broadcom_check_duplex(struct net_device* dev);
static void broadcom_check_speed(struct net_device* dev);
static void broadcom_check_duplex(struct net_device* dev);
@@
-510,6
+509,8
@@
etrax_ethernet_init(void)
* does not share cacheline with any other data (to avoid cache bug)
*/
RxDescList[i].skb = dev_alloc_skb(MAX_MEDIA_DATA_SIZE + 2 * L1_CACHE_BYTES);
* does not share cacheline with any other data (to avoid cache bug)
*/
RxDescList[i].skb = dev_alloc_skb(MAX_MEDIA_DATA_SIZE + 2 * L1_CACHE_BYTES);
+ if (!RxDescList[i].skb)
+ return -ENOMEM;
RxDescList[i].descr.ctrl = 0;
RxDescList[i].descr.sw_len = MAX_MEDIA_DATA_SIZE;
RxDescList[i].descr.next = virt_to_phys(&RxDescList[i + 1]);
RxDescList[i].descr.ctrl = 0;
RxDescList[i].descr.sw_len = MAX_MEDIA_DATA_SIZE;
RxDescList[i].descr.next = virt_to_phys(&RxDescList[i + 1]);
@@
-672,7
+673,7
@@
e100_open(struct net_device *dev)
/* allocate the irq corresponding to the receiving DMA */
if (request_irq(NETWORK_DMA_RX_IRQ_NBR, e100rxtx_interrupt,
/* allocate the irq corresponding to the receiving DMA */
if (request_irq(NETWORK_DMA_RX_IRQ_NBR, e100rxtx_interrupt,
-
SA
_SAMPLE_RANDOM, cardname, (void *)dev)) {
+
IRQF
_SAMPLE_RANDOM, cardname, (void *)dev)) {
goto grace_exit0;
}
goto grace_exit0;
}
@@
-1198,7
+1199,7
@@
e100_send_packet(struct sk_buff *skb, struct net_device *dev)
*/
static irqreturn_t
*/
static irqreturn_t
-e100rxtx_interrupt(int irq, void *dev_id
, struct pt_regs * regs
)
+e100rxtx_interrupt(int irq, void *dev_id)
{
struct net_device *dev = (struct net_device *)dev_id;
struct net_local *np = (struct net_local *)dev->priv;
{
struct net_device *dev = (struct net_device *)dev_id;
struct net_local *np = (struct net_local *)dev->priv;
@@
-1265,7
+1266,7
@@
e100rxtx_interrupt(int irq, void *dev_id, struct pt_regs * regs)
}
static irqreturn_t
}
static irqreturn_t
-e100nw_interrupt(int irq, void *dev_id
, struct pt_regs * regs
)
+e100nw_interrupt(int irq, void *dev_id)
{
struct net_device *dev = (struct net_device *)dev_id;
struct net_local *np = (struct net_local *)dev->priv;
{
struct net_device *dev = (struct net_device *)dev_id;
struct net_local *np = (struct net_local *)dev->priv;
@@
-1553,7
+1554,7
@@
static int e100_nway_reset(struct net_device *dev)
return 0;
}
return 0;
}
-static struct ethtool_ops e100_ethtool_ops = {
+static
const
struct ethtool_ops e100_ethtool_ops = {
.get_settings = e100_get_settings,
.set_settings = e100_set_settings,
.get_drvinfo = e100_get_drvinfo,
.get_settings = e100_get_settings,
.set_settings = e100_set_settings,
.get_drvinfo = e100_get_drvinfo,