Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 96577
b: refs/heads/master
c: 99f5f87
h: refs/heads/master
i:
  96575: 9b59b3c
v: v3
  • Loading branch information
Brice Goglin authored and Jeff Garzik committed May 13, 2008
1 parent d065dcc commit a096586
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 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: bd2db0cf2411ebc081d45bde1b7c6cf726b832f2
refs/heads/master: 99f5f87eb689c5766fa2c101fe75310a7f9ba3cd
5 changes: 4 additions & 1 deletion trunk/drivers/net/myri10ge/myri10ge.c
Original file line number Diff line number Diff line change
Expand Up @@ -1328,7 +1328,7 @@ myri10ge_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
ptr = mgp->product_code_string;
if (ptr == NULL) {
printk(KERN_ERR "myri10ge: %s: Missing product code\n",
netdev->name);
netdev->name);
return 0;
}
for (i = 0; i < 3; i++, ptr++) {
Expand Down Expand Up @@ -1362,6 +1362,7 @@ static int
myri10ge_get_coalesce(struct net_device *netdev, struct ethtool_coalesce *coal)
{
struct myri10ge_priv *mgp = netdev_priv(netdev);

coal->rx_coalesce_usecs = mgp->intr_coal_delay;
return 0;
}
Expand Down Expand Up @@ -1421,6 +1422,7 @@ myri10ge_get_ringparam(struct net_device *netdev,
static u32 myri10ge_get_rx_csum(struct net_device *netdev)
{
struct myri10ge_priv *mgp = netdev_priv(netdev);

if (mgp->csum_flag)
return 1;
else
Expand All @@ -1430,6 +1432,7 @@ static u32 myri10ge_get_rx_csum(struct net_device *netdev)
static int myri10ge_set_rx_csum(struct net_device *netdev, u32 csum_enabled)
{
struct myri10ge_priv *mgp = netdev_priv(netdev);

if (csum_enabled)
mgp->csum_flag = MXGEFW_FLAGS_CKSUM;
else
Expand Down

0 comments on commit a096586

Please sign in to comment.