git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ath9k: Enable MIB and TIM interrupts for station mode.
[pandora-kernel.git]
/
drivers
/
net
/
myri_sbus.c
diff --git
a/drivers/net/myri_sbus.c
b/drivers/net/myri_sbus.c
index
3ad7589
..
88b5288
100644
(file)
--- a/
drivers/net/myri_sbus.c
+++ b/
drivers/net/myri_sbus.c
@@
-318,13
+318,10
@@
static void myri_is_not_so_happy(struct myri_eth *mp)
#ifdef DEBUG_HEADER
static void dump_ehdr(struct ethhdr *ehdr)
{
#ifdef DEBUG_HEADER
static void dump_ehdr(struct ethhdr *ehdr)
{
- DECLARE_MAC_BUF(mac);
- DECLARE_MAC_BUF(mac2);
- printk("ehdr[h_dst(%s)"
- "h_source(%s)"
+ printk("ehdr[h_dst(%pM)"
+ "h_source(%pM)"
"h_proto(%04x)]\n",
"h_proto(%04x)]\n",
- print_mac(mac, ehdr->h_dest), print_mac(mac2, ehdr->h_source),
- ehdr->h_proto);
+ ehdr->h_dest, ehdr->h_source, ehdr->h_proto);
}
static void dump_ehdr_and_myripad(unsigned char *stuff)
}
static void dump_ehdr_and_myripad(unsigned char *stuff)
@@
-528,7
+525,6
@@
static void myri_rx(struct myri_eth *mp, struct net_device *dev)
DRX(("prot[%04x] netif_rx ", skb->protocol));
netif_rx(skb);
DRX(("prot[%04x] netif_rx ", skb->protocol));
netif_rx(skb);
- dev->last_rx = jiffies;
dev->stats.rx_packets++;
dev->stats.rx_bytes += len;
next:
dev->stats.rx_packets++;
dev->stats.rx_bytes += len;
next:
@@
-540,7
+536,7
@@
static void myri_rx(struct myri_eth *mp, struct net_device *dev)
static irqreturn_t myri_interrupt(int irq, void *dev_id)
{
struct net_device *dev = (struct net_device *) dev_id;
static irqreturn_t myri_interrupt(int irq, void *dev_id)
{
struct net_device *dev = (struct net_device *) dev_id;
- struct myri_eth *mp =
(struct myri_eth *) dev->priv
;
+ struct myri_eth *mp =
netdev_priv(dev)
;
void __iomem *lregs = mp->lregs;
struct myri_channel __iomem *chan = &mp->shmem->channel;
unsigned long flags;
void __iomem *lregs = mp->lregs;
struct myri_channel __iomem *chan = &mp->shmem->channel;
unsigned long flags;
@@
-579,14
+575,14
@@
static irqreturn_t myri_interrupt(int irq, void *dev_id)
static int myri_open(struct net_device *dev)
{
static int myri_open(struct net_device *dev)
{
- struct myri_eth *mp =
(struct myri_eth *) dev->priv
;
+ struct myri_eth *mp =
netdev_priv(dev)
;
return myri_init(mp, in_interrupt());
}
static int myri_close(struct net_device *dev)
{
return myri_init(mp, in_interrupt());
}
static int myri_close(struct net_device *dev)
{
- struct myri_eth *mp =
(struct myri_eth *) dev->priv
;
+ struct myri_eth *mp =
netdev_priv(dev)
;
myri_clean_rings(mp);
return 0;
myri_clean_rings(mp);
return 0;
@@
-594,7
+590,7
@@
static int myri_close(struct net_device *dev)
static void myri_tx_timeout(struct net_device *dev)
{
static void myri_tx_timeout(struct net_device *dev)
{
- struct myri_eth *mp =
(struct myri_eth *) dev->priv
;
+ struct myri_eth *mp =
netdev_priv(dev)
;
printk(KERN_ERR "%s: transmit timed out, resetting\n", dev->name);
printk(KERN_ERR "%s: transmit timed out, resetting\n", dev->name);
@@
-605,7
+601,7
@@
static void myri_tx_timeout(struct net_device *dev)
static int myri_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
static int myri_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
- struct myri_eth *mp =
(struct myri_eth *) dev->priv
;
+ struct myri_eth *mp =
netdev_priv(dev)
;
struct sendq __iomem *sq = mp->sq;
struct myri_txd __iomem *txd;
unsigned long flags;
struct sendq __iomem *sq = mp->sq;
struct myri_txd __iomem *txd;
unsigned long flags;
@@
-752,7
+748,7
@@
static int myri_rebuild_header(struct sk_buff *skb)
switch (eth->h_proto)
{
#ifdef CONFIG_INET
switch (eth->h_proto)
{
#ifdef CONFIG_INET
- case
__constant_htons
(ETH_P_IP):
+ case
cpu_to_be16
(ETH_P_IP):
return arp_find(eth->h_dest, skb);
#endif
return arp_find(eth->h_dest, skb);
#endif
@@
-905,7
+901,6
@@
static int __devinit myri_sbus_probe(struct of_device *op, const struct of_devic
struct device_node *dp = op->node;
static unsigned version_printed;
struct net_device *dev;
struct device_node *dp = op->node;
static unsigned version_printed;
struct net_device *dev;
- DECLARE_MAC_BUF(mac);
struct myri_eth *mp;
const void *prop;
static int num;
struct myri_eth *mp;
const void *prop;
static int num;
@@
-1088,15
+1083,15
@@
static int __devinit myri_sbus_probe(struct of_device *op, const struct of_devic
num++;
num++;
- printk("%s: MyriCOM MyriNET Ethernet %
s
\n",
- dev->name,
print_mac(mac, dev->dev_addr)
);
+ printk("%s: MyriCOM MyriNET Ethernet %
pM
\n",
+ dev->name,
dev->dev_addr
);
return 0;
err_free_irq:
free_irq(dev->irq, dev);
err:
return 0;
err_free_irq:
free_irq(dev->irq, dev);
err:
- /* This will also free the co-allocated
'dev->priv'
*/
+ /* This will also free the co-allocated
private data
*/
free_netdev(dev);
return -ENODEV;
}
free_netdev(dev);
return -ENODEV;
}