From fae5f63db97fc25be66fe28a2b296c1aa542a1fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= Date: Thu, 6 Aug 2009 21:56:43 +0000 Subject: [PATCH] --- yaml --- r: 159445 b: refs/heads/master c: 5da63cc4b2258e1c06ee41637492717481025143 h: refs/heads/master i: 159443: dacda4978c26137628c87db155eaf52d08784664 v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/f_phonet.c | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index bb358a7c96e1..ddc5270a176a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa11d958d1a6572eda08214d7c6a735804fe48a5 +refs/heads/master: 5da63cc4b2258e1c06ee41637492717481025143 diff --git a/trunk/drivers/usb/gadget/f_phonet.c b/trunk/drivers/usb/gadget/f_phonet.c index d17f1082df96..f4eff7ca0d36 100644 --- a/trunk/drivers/usb/gadget/f_phonet.c +++ b/trunk/drivers/usb/gadget/f_phonet.c @@ -261,20 +261,10 @@ static int pn_net_xmit(struct sk_buff *skb, struct net_device *dev) static int pn_net_mtu(struct net_device *dev, int new_mtu) { - struct phonet_port *port = netdev_priv(dev); - unsigned long flags; - int err = -EBUSY; - if ((new_mtu < PHONET_MIN_MTU) || (new_mtu > PHONET_MAX_MTU)) return -EINVAL; - - spin_lock_irqsave(&port->lock, flags); - if (!netif_carrier_ok(dev)) { - dev->mtu = new_mtu; - err = 0; - } - spin_unlock_irqrestore(&port->lock, flags); - return err; + dev->mtu = new_mtu; + return 0; } static const struct net_device_ops pn_netdev_ops = {