Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 90367
b: refs/heads/master
c: c3033b0
h: refs/heads/master
i:
  90365: fa1940a
  90363: d2781fb
  90359: 7bcd1bb
  90351: d61d655
  90335: e86092c
  90303: 49c8bc5
  90239: 7dbee9e
  90111: db57e95
v: v3
  • Loading branch information
Joe Perches authored and Jeff Garzik committed Mar 26, 2008
1 parent 90fbdd2 commit 4fb6a4e
Show file tree
Hide file tree
Showing 162 changed files with 1,286 additions and 2,691 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f49e1aa133c2c9b74b5dfddca8863609bbda9086
refs/heads/master: c3033b01d763aff572080db09ddcebed115b9cf5
2 changes: 1 addition & 1 deletion trunk/arch/ia64/hp/sim/simeth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ simeth_device_event(struct notifier_block *this,unsigned long event, void *ptr)
return NOTIFY_DONE;
}

if (dev_net(dev) != &init_net)
if (dev->nd_net != &init_net)
return NOTIFY_DONE;

if ( event != NETDEV_UP && event != NETDEV_DOWN ) return NOTIFY_DONE;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/block/aoe/aoenet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt,
struct aoe_hdr *h;
u32 n;

if (dev_net(ifp) != &init_net)
if (ifp->nd_net != &init_net)
goto exit;

skb = skb_share_check(skb, GFP_ATOMIC);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/bonding/bond_3ad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2429,7 +2429,7 @@ int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct pac
struct slave *slave = NULL;
int ret = NET_RX_DROP;

if (dev_net(dev) != &init_net)
if (dev->nd_net != &init_net)
goto out;

if (!(dev->flags & IFF_MASTER))
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/bonding/bond_alb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct
struct arp_pkt *arp = (struct arp_pkt *)skb->data;
int res = NET_RX_DROP;

if (dev_net(bond_dev) != &init_net)
if (bond_dev->nd_net != &init_net)
goto out;

if (!(bond_dev->flags & IFF_MASTER))
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/net/bonding/bond_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2629,7 +2629,7 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
unsigned char *arp_ptr;
__be32 sip, tip;

if (dev_net(dev) != &init_net)
if (dev->nd_net != &init_net)
goto out;

if (!(dev->priv_flags & IFF_BONDING) || !(dev->flags & IFF_MASTER))
Expand Down Expand Up @@ -3470,7 +3470,7 @@ static int bond_netdev_event(struct notifier_block *this, unsigned long event, v
{
struct net_device *event_dev = (struct net_device *)ptr;

if (dev_net(event_dev) != &init_net)
if (event_dev->nd_net != &init_net)
return NOTIFY_DONE;

dprintk("event_dev: %s, event: %lx\n",
Expand Down Expand Up @@ -3508,7 +3508,7 @@ static int bond_inetaddr_event(struct notifier_block *this, unsigned long event,
struct bonding *bond, *bond_next;
struct vlan_entry *vlan, *vlan_next;

if (dev_net(ifa->ifa_dev->dev) != &init_net)
if (ifa->ifa_dev->dev->nd_net != &init_net)
return NOTIFY_DONE;

list_for_each_entry_safe(bond, bond_next, &bond_dev_list, bond_list) {
Expand Down
26 changes: 13 additions & 13 deletions trunk/drivers/net/e1000/e1000.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ struct e1000_tx_ring {
spinlock_t tx_lock;
uint16_t tdh;
uint16_t tdt;
boolean_t last_tx_tso;
bool last_tx_tso;
};

struct e1000_rx_ring {
Expand Down Expand Up @@ -283,17 +283,17 @@ struct e1000_adapter {
uint32_t tx_fifo_size;
uint8_t tx_timeout_factor;
atomic_t tx_fifo_stall;
boolean_t pcix_82544;
boolean_t detect_tx_hung;
bool pcix_82544;
bool detect_tx_hung;

/* RX */
#ifdef CONFIG_E1000_NAPI
boolean_t (*clean_rx) (struct e1000_adapter *adapter,
struct e1000_rx_ring *rx_ring,
int *work_done, int work_to_do);
bool (*clean_rx) (struct e1000_adapter *adapter,
struct e1000_rx_ring *rx_ring,
int *work_done, int work_to_do);
#else
boolean_t (*clean_rx) (struct e1000_adapter *adapter,
struct e1000_rx_ring *rx_ring);
bool (*clean_rx) (struct e1000_adapter *adapter,
struct e1000_rx_ring *rx_ring);
#endif
void (*alloc_rx_buf) (struct e1000_adapter *adapter,
struct e1000_rx_ring *rx_ring,
Expand All @@ -312,7 +312,7 @@ struct e1000_adapter {
uint32_t alloc_rx_buff_failed;
uint32_t rx_int_delay;
uint32_t rx_abs_int_delay;
boolean_t rx_csum;
bool rx_csum;
unsigned int rx_ps_pages;
uint32_t gorcl;
uint64_t gorcl_old;
Expand All @@ -335,12 +335,12 @@ struct e1000_adapter {
struct e1000_rx_ring test_rx_ring;

int msg_enable;
boolean_t have_msi;
bool have_msi;

/* to not mess up cache alignment, always add to the bottom */
boolean_t tso_force;
boolean_t smart_power_down; /* phy smart power down */
boolean_t quad_port_a;
bool tso_force;
bool smart_power_down; /* phy smart power down */
bool quad_port_a;
unsigned long flags;
uint32_t eeprom_wol;
};
Expand Down
17 changes: 9 additions & 8 deletions trunk/drivers/net/e1000/e1000_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ e1000_set_tso(struct net_device *netdev, uint32_t data)
netdev->features &= ~NETIF_F_TSO6;

DPRINTK(PROBE, INFO, "TSO is %s\n", data ? "Enabled" : "Disabled");
adapter->tso_force = TRUE;
adapter->tso_force = true;
return 0;
}

Expand Down Expand Up @@ -922,7 +922,8 @@ static int
e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data)
{
struct net_device *netdev = adapter->netdev;
uint32_t mask, i=0, shared_int = TRUE;
uint32_t mask, i = 0;
bool shared_int = true;
uint32_t irq = adapter->pdev->irq;

*data = 0;
Expand All @@ -931,7 +932,7 @@ e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data)
/* Hook up test interrupt handler just for this test */
if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED, netdev->name,
netdev))
shared_int = FALSE;
shared_int = false;
else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED,
netdev->name, netdev)) {
*data = 1;
Expand Down Expand Up @@ -1295,7 +1296,7 @@ e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
uint32_t ctrl_reg = 0;
uint32_t stat_reg = 0;

adapter->hw.autoneg = FALSE;
adapter->hw.autoneg = false;

if (adapter->hw.phy_type == e1000_phy_m88) {
/* Auto-MDI/MDIX Off */
Expand Down Expand Up @@ -1473,7 +1474,7 @@ e1000_loopback_cleanup(struct e1000_adapter *adapter)
case e1000_82545_rev_3:
case e1000_82546_rev_3:
default:
hw->autoneg = TRUE;
hw->autoneg = true;
if (hw->phy_type == e1000_phy_gg82563)
e1000_write_phy_reg(hw,
GG82563_PHY_KMRN_MODE_CTRL,
Expand Down Expand Up @@ -1607,13 +1608,13 @@ e1000_link_test(struct e1000_adapter *adapter, uint64_t *data)
*data = 0;
if (adapter->hw.media_type == e1000_media_type_internal_serdes) {
int i = 0;
adapter->hw.serdes_link_down = TRUE;
adapter->hw.serdes_link_down = true;

/* On some blade server designs, link establishment
* could take as long as 2-3 minutes */
do {
e1000_check_for_link(&adapter->hw);
if (adapter->hw.serdes_link_down == FALSE)
if (!adapter->hw.serdes_link_down)
return *data;
msleep(20);
} while (i++ < 3750);
Expand Down Expand Up @@ -1649,7 +1650,7 @@ e1000_diag_test(struct net_device *netdev,
struct ethtool_test *eth_test, uint64_t *data)
{
struct e1000_adapter *adapter = netdev_priv(netdev);
boolean_t if_running = netif_running(netdev);
bool if_running = netif_running(netdev);

set_bit(__E1000_TESTING, &adapter->flags);
if (eth_test->flags == ETH_TEST_FL_OFFLINE) {
Expand Down
Loading

0 comments on commit 4fb6a4e

Please sign in to comment.