diff options
| author | Ingo Molnar | 2009-09-15 12:18:15 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2009-09-15 12:18:15 +0200 |
| commit | dca2d6ac09d9ef59ff46820d4f0c94b08a671202 (patch) | |
| tree | fdec753b842dad09e3a4151954fab3eb5c43500d /drivers/net/sungem.c | |
| parent | tracing: Fix ring-buffer and ksym tracer merge interaction (diff) | |
| parent | Merge branch 'for-linus3' of git://git.kernel.org/pub/scm/linux/kernel/git/jm... (diff) | |
| download | kernel-qcow2-linux-dca2d6ac09d9ef59ff46820d4f0c94b08a671202.tar.gz kernel-qcow2-linux-dca2d6ac09d9ef59ff46820d4f0c94b08a671202.tar.xz kernel-qcow2-linux-dca2d6ac09d9ef59ff46820d4f0c94b08a671202.zip | |
Merge branch 'linus' into tracing/hw-breakpoints
Conflicts:
arch/x86/kernel/process_64.c
Semantic conflict fixed in:
arch/x86/kvm/x86.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/sungem.c')
| -rw-r--r-- | drivers/net/sungem.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index d2dfe0ab5106..305ec3d783db 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c @@ -1015,7 +1015,8 @@ static __inline__ int gem_intme(int entry) return 0; } -static int gem_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t gem_start_xmit(struct sk_buff *skb, + struct net_device *dev) { struct gem *gp = netdev_priv(dev); int entry; @@ -2851,9 +2852,7 @@ static int gem_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) break; case SIOCSMIIREG: /* Write MII PHY register. */ - if (!capable(CAP_NET_ADMIN)) - rc = -EPERM; - else if (!gp->running) + if (!gp->running) rc = -EAGAIN; else { __phy_write(gp, data->phy_id & 0x1f, data->reg_num & 0x1f, |