projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] tty: trivial kzalloc opportunity
[deliverable/linux.git]
/
drivers
/
net
/
starfire.c
diff --git
a/drivers/net/starfire.c
b/drivers/net/starfire.c
index 8e1f6206b7d0da7c49e1b487a925ecb2b6f42faa..3d617e8f54b563c51bce7b9cf0fe583451c78222 100644
(file)
--- a/
drivers/net/starfire.c
+++ b/
drivers/net/starfire.c
@@
-642,7
+642,7
@@
static struct net_device_stats *get_stats(struct net_device *dev);
static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
static int netdev_close(struct net_device *dev);
static void netdev_media_change(struct net_device *dev);
static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
static int netdev_close(struct net_device *dev);
static void netdev_media_change(struct net_device *dev);
-static struct ethtool_ops ethtool_ops;
+static
const
struct ethtool_ops ethtool_ops;
#ifdef VLAN_SUPPORT
#ifdef VLAN_SUPPORT
@@
-1230,7
+1230,7
@@
static int start_tx(struct sk_buff *skb, struct net_device *dev)
}
#if defined(ZEROCOPY) && defined(HAS_BROKEN_FIRMWARE)
}
#if defined(ZEROCOPY) && defined(HAS_BROKEN_FIRMWARE)
- if (skb->ip_summed == CHECKSUM_
HW
) {
+ if (skb->ip_summed == CHECKSUM_
PARTIAL
) {
if (skb_padto(skb, (skb->len + PADDING_MASK) & ~PADDING_MASK))
return NETDEV_TX_OK;
}
if (skb_padto(skb, (skb->len + PADDING_MASK) & ~PADDING_MASK))
return NETDEV_TX_OK;
}
@@
-1252,7
+1252,7
@@
static int start_tx(struct sk_buff *skb, struct net_device *dev)
status |= TxDescIntr;
np->reap_tx = 0;
}
status |= TxDescIntr;
np->reap_tx = 0;
}
- if (skb->ip_summed == CHECKSUM_
HW
) {
+ if (skb->ip_summed == CHECKSUM_
PARTIAL
) {
status |= TxCalTCP;
np->stats.tx_compressed++;
}
status |= TxCalTCP;
np->stats.tx_compressed++;
}
@@
-1499,7
+1499,7
@@
static int __netdev_rx(struct net_device *dev, int *quota)
* Until then, the printk stays. :-) -Ion
*/
else if (le16_to_cpu(desc->status2) & 0x0040) {
* Until then, the printk stays. :-) -Ion
*/
else if (le16_to_cpu(desc->status2) & 0x0040) {
- skb->ip_summed = CHECKSUM_
HW
;
+ skb->ip_summed = CHECKSUM_
COMPLETE
;
skb->csum = le16_to_cpu(desc->csum);
printk(KERN_DEBUG "%s: checksum_hw, status2 = %#x\n", dev->name, le16_to_cpu(desc->status2));
}
skb->csum = le16_to_cpu(desc->csum);
printk(KERN_DEBUG "%s: checksum_hw, status2 = %#x\n", dev->name, le16_to_cpu(desc->status2));
}
@@
-1868,7
+1868,7
@@
static void set_msglevel(struct net_device *dev, u32 val)
debug = val;
}
debug = val;
}
-static struct ethtool_ops ethtool_ops = {
+static
const
struct ethtool_ops ethtool_ops = {
.begin = check_if_running,
.get_drvinfo = get_drvinfo,
.get_settings = get_settings,
.begin = check_if_running,
.get_drvinfo = get_drvinfo,
.get_settings = get_settings,
@@
-1984,7
+1984,7
@@
static int starfire_suspend(struct pci_dev *pdev, pm_message_t state)
static int starfire_resume(struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
static int starfire_resume(struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
-
+
pci_set_power_state(pdev, PCI_D0);
pci_restore_state(pdev);
pci_set_power_state(pdev, PCI_D0);
pci_restore_state(pdev);
This page took
0.040173 seconds
and
5
git commands to generate.