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
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
net
/
forcedeth.c
diff --git
a/drivers/net/forcedeth.c
b/drivers/net/forcedeth.c
index
4da05b1
..
0fa1776
100644
(file)
--- a/
drivers/net/forcedeth.c
+++ b/
drivers/net/forcedeth.c
@@
-2321,14
+2321,11
@@
static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb,
NV_TX2_CHECKSUM_L3 | NV_TX2_CHECKSUM_L4 : 0;
/* vlan tag */
NV_TX2_CHECKSUM_L3 | NV_TX2_CHECKSUM_L4 : 0;
/* vlan tag */
- if (likely(!np->vlangrp)) {
+ if (vlan_tx_tag_present(skb))
+ start_tx->txvlan = cpu_to_le32(NV_TX3_VLAN_TAG_PRESENT |
+ vlan_tx_tag_get(skb));
+ else
start_tx->txvlan = 0;
start_tx->txvlan = 0;
- } else {
- if (vlan_tx_tag_present(skb))
- start_tx->txvlan = cpu_to_le32(NV_TX3_VLAN_TAG_PRESENT | vlan_tx_tag_get(skb));
- else
- start_tx->txvlan = 0;
- }
spin_lock_irqsave(&np->lock, flags);
spin_lock_irqsave(&np->lock, flags);
@@
-4620,7
+4617,7
@@
static int nv_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam*
static u32 nv_get_rx_csum(struct net_device *dev)
{
struct fe_priv *np = netdev_priv(dev);
static u32 nv_get_rx_csum(struct net_device *dev)
{
struct fe_priv *np = netdev_priv(dev);
- return
(np->rx_csum)
!= 0;
+ return
np->rx_csum
!= 0;
}
static int nv_set_rx_csum(struct net_device *dev, u32 data)
}
static int nv_set_rx_csum(struct net_device *dev, u32 data)
@@
-5440,13
+5437,13
@@
static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
init_timer(&np->oom_kick);
np->oom_kick.data = (unsigned long) dev;
init_timer(&np->oom_kick);
np->oom_kick.data = (unsigned long) dev;
- np->oom_kick.function =
&nv_do_rx_refill;
/* timer handler */
+ np->oom_kick.function =
nv_do_rx_refill;
/* timer handler */
init_timer(&np->nic_poll);
np->nic_poll.data = (unsigned long) dev;
init_timer(&np->nic_poll);
np->nic_poll.data = (unsigned long) dev;
- np->nic_poll.function =
&nv_do_nic_poll;
/* timer handler */
+ np->nic_poll.function =
nv_do_nic_poll;
/* timer handler */
init_timer(&np->stats_poll);
np->stats_poll.data = (unsigned long) dev;
init_timer(&np->stats_poll);
np->stats_poll.data = (unsigned long) dev;
- np->stats_poll.function =
&nv_do_stats_poll;
/* timer handler */
+ np->stats_poll.function =
nv_do_stats_poll;
/* timer handler */
err = pci_enable_device(pci_dev);
if (err)
err = pci_enable_device(pci_dev);
if (err)