Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 224407
b: refs/heads/master
c: 4dd1518
h: refs/heads/master
i:
  224405: 73a14a8
  224403: ca5d2b5
  224399: 4ae75a8
v: v3
  • Loading branch information
Joe Perches authored and David S. Miller committed Nov 17, 2010
1 parent a773e90 commit 3784061
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a887e220760c12e00b0591d67987e26f6e270d71
refs/heads/master: 4dd151876b6b81040121708ebc23c6cd1a3d5be8
8 changes: 4 additions & 4 deletions trunk/drivers/net/qla3xxx.c
Original file line number Diff line number Diff line change
Expand Up @@ -2467,7 +2467,7 @@ static int ql_send_map(struct ql3_adapter *qdev,
static netdev_tx_t ql3xxx_send(struct sk_buff *skb,
struct net_device *ndev)
{
struct ql3_adapter *qdev = (struct ql3_adapter *)netdev_priv(ndev);
struct ql3_adapter *qdev = netdev_priv(ndev);
struct ql3xxx_port_registers __iomem *port_regs =
qdev->mem_map_registers;
struct ql_tx_buf_cb *tx_cb;
Expand Down Expand Up @@ -3390,7 +3390,7 @@ static void ql_set_mac_info(struct ql3_adapter *qdev)

static void ql_display_dev_info(struct net_device *ndev)
{
struct ql3_adapter *qdev = (struct ql3_adapter *)netdev_priv(ndev);
struct ql3_adapter *qdev = netdev_priv(ndev);
struct pci_dev *pdev = qdev->pdev;

netdev_info(ndev,
Expand Down Expand Up @@ -3573,7 +3573,7 @@ static int ql3xxx_open(struct net_device *ndev)

static int ql3xxx_set_mac_address(struct net_device *ndev, void *p)
{
struct ql3_adapter *qdev = (struct ql3_adapter *)netdev_priv(ndev);
struct ql3_adapter *qdev = netdev_priv(ndev);
struct ql3xxx_port_registers __iomem *port_regs =
qdev->mem_map_registers;
struct sockaddr *addr = p;
Expand Down Expand Up @@ -3608,7 +3608,7 @@ static int ql3xxx_set_mac_address(struct net_device *ndev, void *p)

static void ql3xxx_tx_timeout(struct net_device *ndev)
{
struct ql3_adapter *qdev = (struct ql3_adapter *)netdev_priv(ndev);
struct ql3_adapter *qdev = netdev_priv(ndev);

netdev_err(ndev, "Resetting...\n");
/*
Expand Down

0 comments on commit 3784061

Please sign in to comment.