git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
[safe/jmp/linux-2.6]
/
drivers
/
net
/
xen-netfront.c
diff --git
a/drivers/net/xen-netfront.c
b/drivers/net/xen-netfront.c
index
2ce536f
..
a869b45
100644
(file)
--- a/
drivers/net/xen-netfront.c
+++ b/
drivers/net/xen-netfront.c
@@
-42,6
+42,7
@@
#include <linux/mm.h>
#include <net/ip.h>
#include <linux/mm.h>
#include <net/ip.h>
+#include <xen/xen.h>
#include <xen/xenbus.h>
#include <xen/events.h>
#include <xen/page.h>
#include <xen/xenbus.h>
#include <xen/events.h>
#include <xen/page.h>
@@
-51,7
+52,7
@@
#include <xen/interface/memory.h>
#include <xen/interface/grant_table.h>
#include <xen/interface/memory.h>
#include <xen/interface/grant_table.h>
-static struct ethtool_ops xennet_ethtool_ops;
+static
const
struct ethtool_ops xennet_ethtool_ops;
struct netfront_cb {
struct page *page;
struct netfront_cb {
struct page *page;
@@
-196,7
+197,7
@@
static void rx_refill_timeout(unsigned long data)
{
struct net_device *dev = (struct net_device *)data;
struct netfront_info *np = netdev_priv(dev);
{
struct net_device *dev = (struct net_device *)data;
struct netfront_info *np = netdev_priv(dev);
- n
etif_rx
_schedule(&np->napi);
+ n
api
_schedule(&np->napi);
}
static int netfront_tx_slot_available(struct netfront_info *np)
}
static int netfront_tx_slot_available(struct netfront_info *np)
@@
-328,7
+329,7
@@
static int xennet_open(struct net_device *dev)
xennet_alloc_rx_buffers(dev);
np->rx.sring->rsp_event = np->rx.rsp_cons + 1;
if (RING_HAS_UNCONSUMED_RESPONSES(&np->rx))
xennet_alloc_rx_buffers(dev);
np->rx.sring->rsp_event = np->rx.rsp_cons + 1;
if (RING_HAS_UNCONSUMED_RESPONSES(&np->rx))
- n
etif_rx
_schedule(&np->napi);
+ n
api
_schedule(&np->napi);
}
spin_unlock_bh(&np->rx_lock);
}
spin_unlock_bh(&np->rx_lock);
@@
-558,12
+559,12
@@
static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
spin_unlock_irq(&np->tx_lock);
spin_unlock_irq(&np->tx_lock);
- return
0
;
+ return
NETDEV_TX_OK
;
drop:
dev->stats.tx_dropped++;
dev_kfree_skb(skb);
drop:
dev->stats.tx_dropped++;
dev_kfree_skb(skb);
- return
0
;
+ return
NETDEV_TX_OK
;
}
static int xennet_close(struct net_device *dev)
}
static int xennet_close(struct net_device *dev)
@@
-979,7
+980,7
@@
err:
RING_FINAL_CHECK_FOR_RESPONSES(&np->rx, more_to_do);
if (!more_to_do)
RING_FINAL_CHECK_FOR_RESPONSES(&np->rx, more_to_do);
if (!more_to_do)
- __n
etif_rx
_complete(napi);
+ __n
api
_complete(napi);
local_irq_restore(flags);
}
local_irq_restore(flags);
}
@@
-1212,7
+1213,7
@@
static int __devinit netfront_probe(struct xenbus_device *dev,
}
info = netdev_priv(netdev);
}
info = netdev_priv(netdev);
- dev
->dev.driver_data = info
;
+ dev
_set_drvdata(&dev->dev, info)
;
err = register_netdev(info->netdev);
if (err) {
err = register_netdev(info->netdev);
if (err) {
@@
-1233,7
+1234,7
@@
static int __devinit netfront_probe(struct xenbus_device *dev,
fail:
free_netdev(netdev);
fail:
free_netdev(netdev);
- dev
->dev.driver_data = NULL
;
+ dev
_set_drvdata(&dev->dev, NULL)
;
return err;
}
return err;
}
@@
-1275,7
+1276,7
@@
static void xennet_disconnect_backend(struct netfront_info *info)
*/
static int netfront_resume(struct xenbus_device *dev)
{
*/
static int netfront_resume(struct xenbus_device *dev)
{
- struct netfront_info *info = dev
->dev.driver_data
;
+ struct netfront_info *info = dev
_get_drvdata(&dev->dev)
;
dev_dbg(&dev->dev, "%s\n", dev->nodename);
dev_dbg(&dev->dev, "%s\n", dev->nodename);
@@
-1317,7
+1318,7
@@
static irqreturn_t xennet_interrupt(int irq, void *dev_id)
xennet_tx_buf_gc(dev);
/* Under tx_lock: protects access to rx shared-ring indexes. */
if (RING_HAS_UNCONSUMED_RESPONSES(&np->rx))
xennet_tx_buf_gc(dev);
/* Under tx_lock: protects access to rx shared-ring indexes. */
if (RING_HAS_UNCONSUMED_RESPONSES(&np->rx))
- n
etif_rx
_schedule(&np->napi);
+ n
api
_schedule(&np->napi);
}
spin_unlock_irqrestore(&np->tx_lock, flags);
}
spin_unlock_irqrestore(&np->tx_lock, flags);
@@
-1600,7
+1601,7
@@
static int xennet_connect(struct net_device *dev)
static void backend_changed(struct xenbus_device *dev,
enum xenbus_state backend_state)
{
static void backend_changed(struct xenbus_device *dev,
enum xenbus_state backend_state)
{
- struct netfront_info *np = dev
->dev.driver_data
;
+ struct netfront_info *np = dev
_get_drvdata(&dev->dev)
;
struct net_device *netdev = np->netdev;
dev_dbg(&dev->dev, "%s\n", xenbus_strstate(backend_state));
struct net_device *netdev = np->netdev;
dev_dbg(&dev->dev, "%s\n", xenbus_strstate(backend_state));
@@
-1627,7
+1628,7
@@
static void backend_changed(struct xenbus_device *dev,
}
}
}
}
-static struct ethtool_ops xennet_ethtool_ops =
+static
const
struct ethtool_ops xennet_ethtool_ops =
{
.set_tx_csum = ethtool_op_set_tx_csum,
.set_sg = xennet_set_sg,
{
.set_tx_csum = ethtool_op_set_tx_csum,
.set_sg = xennet_set_sg,
@@
-1774,7
+1775,7
@@
static struct xenbus_device_id netfront_ids[] = {
static int __devexit xennet_remove(struct xenbus_device *dev)
{
static int __devexit xennet_remove(struct xenbus_device *dev)
{
- struct netfront_info *info = dev
->dev.driver_data
;
+ struct netfront_info *info = dev
_get_drvdata(&dev->dev)
;
dev_dbg(&dev->dev, "%s\n", dev->nodename);
dev_dbg(&dev->dev, "%s\n", dev->nodename);