Commit f415c413 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  irda/sa1100_ir: fix broken netdev_ops conversion
  irda/au1k_ir: fix broken netdev_ops conversion
  pkt_sched: Fix bogon in tasklet_hrtimer changes.
parents 4dc627d5 4484b9c8

drivers/net/irda/au1k_ir.c

+0 −4
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/init.h>

#include <linux/errno.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>

#include <linux/slab.h>

#include <linux/rtnetlink.h>

#include <linux/interrupt.h>
@@ -205,9 +204,6 @@ static const struct net_device_ops au1k_irda_netdev_ops = { 
	.ndo_start_xmit		= au1k_irda_hard_xmit,

	.ndo_tx_timeout		= au1k_tx_timeout,

	.ndo_do_ioctl		= au1k_irda_ioctl,

	.ndo_change_mtu		= eth_change_mtu,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address	= eth_mac_addr,

};



static int au1k_irda_net_init(struct net_device *dev)

drivers/net/irda/sa1100_ir.c

+0 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <linux/init.h>

#include <linux/errno.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>

#include <linux/slab.h>

#include <linux/rtnetlink.h>

#include <linux/interrupt.h>
@@ -881,9 +880,6 @@ static const struct net_device_ops sa1100_irda_netdev_ops = { 
	.ndo_stop		= sa1100_irda_stop,

	.ndo_start_xmit		= sa1100_irda_hard_xmit,

	.ndo_do_ioctl		= sa1100_irda_ioctl,

	.ndo_change_mtu		= eth_change_mtu,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address	= eth_mac_addr,

};



static int sa1100_irda_probe(struct platform_device *pdev)

net/sched/sch_api.c

+1 −1
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ EXPORT_SYMBOL(qdisc_warn_nonwc); 
static enum hrtimer_restart qdisc_watchdog(struct hrtimer *timer)

{

	struct qdisc_watchdog *wd = container_of(timer, struct qdisc_watchdog,

						 timer);

						 timer.timer);



	wd->qdisc->flags &= ~TCQ_F_THROTTLED;

	__netif_schedule(qdisc_root(wd->qdisc));

net/sched/sch_cbq.c

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ static psched_tdiff_t cbq_undelay_prio(struct cbq_sched_data *q, int prio, 
static enum hrtimer_restart cbq_undelay(struct hrtimer *timer)

{

	struct cbq_sched_data *q = container_of(timer, struct cbq_sched_data,

						delay_timer);

						delay_timer.timer);

	struct Qdisc *sch = q->watchdog.qdisc;

	psched_time_t now;

	psched_tdiff_t delay = 0;