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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
net
/
myri_sbus.c
diff --git
a/drivers/net/myri_sbus.c
b/drivers/net/myri_sbus.c
index
aad5494
..
6c86dca
100644
(file)
--- a/
drivers/net/myri_sbus.c
+++ b/
drivers/net/myri_sbus.c
@@
-277,7
+277,7
@@
static void myri_init_rings(struct myri_eth *mp, int from_irq)
struct recvq __iomem *rq = mp->rq;
struct myri_rxd __iomem *rxd = &rq->myri_rxd[0];
struct net_device *dev = mp->dev;
struct recvq __iomem *rq = mp->rq;
struct myri_rxd __iomem *rxd = &rq->myri_rxd[0];
struct net_device *dev = mp->dev;
-
in
t gfp_flags = GFP_KERNEL;
+
gfp_
t gfp_flags = GFP_KERNEL;
int i;
if (from_irq || in_interrupt())
int i;
if (from_irq || in_interrupt())
@@
-369,7
+369,7
@@
static void myri_tx(struct myri_eth *mp, struct net_device *dev)
* assume 802.3 if the type field is short enough to be a length.
* This is normal practice and works for any 'now in use' protocol.
*/
* assume 802.3 if the type field is short enough to be a length.
* This is normal practice and works for any 'now in use' protocol.
*/
-static
unsigned short
myri_type_trans(struct sk_buff *skb, struct net_device *dev)
+static
__be16
myri_type_trans(struct sk_buff *skb, struct net_device *dev)
{
struct ethhdr *eth;
unsigned char *rawp;
{
struct ethhdr *eth;
unsigned char *rawp;