mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25: (1470 commits) [IPV6] ADDRLABEL: Fix double free on label deletion. [PPP]: Sparse warning fixes. [IPV4] fib_trie: remove unneeded NULL check [IPV4] fib_trie: More whitespace cleanup. [NET_SCHED]: Use nla_policy for attribute validation in ematches [NET_SCHED]: Use nla_policy for attribute validation in actions [NET_SCHED]: Use nla_policy for attribute validation in classifiers [NET_SCHED]: Use nla_policy for attribute validation in packet schedulers [NET_SCHED]: sch_api: introduce constant for rate table size [NET_SCHED]: Use typeful attribute parsing helpers [NET_SCHED]: Use typeful attribute construction helpers [NET_SCHED]: Use NLA_PUT_STRING for string dumping [NET_SCHED]: Use nla_nest_start/nla_nest_end [NET_SCHED]: Propagate nla_parse return value [NET_SCHED]: act_api: use PTR_ERR in tcf_action_init/tcf_action_get [NET_SCHED]: act_api: use nlmsg_parse [NET_SCHED]: act_api: fix netlink API conversion bug [NET_SCHED]: sch_netem: use nla_parse_nested_compat [NET_SCHED]: sch_atm: fix format string warning [NETNS]: Add namespace for ICMP replying code. ...
This commit is contained in:
commit
0ba6c33bcd
1113 changed files with 140020 additions and 55548 deletions
|
|
@ -272,7 +272,7 @@ scc_enet_timeout(struct net_device *dev)
|
|||
* This is called from the CPM handler, not the MPC core interrupt.
|
||||
*/
|
||||
static irqreturn_t
|
||||
scc_enet_interrupt(int irq, void * dev_id)
|
||||
scc_enet_interrupt(int irq, void *dev_id)
|
||||
{
|
||||
struct net_device *dev = dev_id;
|
||||
volatile struct scc_enet_private *cep;
|
||||
|
|
@ -280,7 +280,7 @@ scc_enet_interrupt(int irq, void * dev_id)
|
|||
ushort int_events;
|
||||
int must_restart;
|
||||
|
||||
cep = (struct scc_enet_private *)dev->priv;
|
||||
cep = dev->priv;
|
||||
|
||||
/* Get the interrupt events that caused us to be here.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -524,7 +524,7 @@ fcc_enet_timeout(struct net_device *dev)
|
|||
|
||||
/* The interrupt handler. */
|
||||
static irqreturn_t
|
||||
fcc_enet_interrupt(int irq, void * dev_id)
|
||||
fcc_enet_interrupt(int irq, void *dev_id)
|
||||
{
|
||||
struct net_device *dev = dev_id;
|
||||
volatile struct fcc_enet_private *cep;
|
||||
|
|
@ -532,7 +532,7 @@ fcc_enet_interrupt(int irq, void * dev_id)
|
|||
ushort int_events;
|
||||
int must_restart;
|
||||
|
||||
cep = (struct fcc_enet_private *)dev->priv;
|
||||
cep = dev->priv;
|
||||
|
||||
/* Get the interrupt events that caused us to be here.
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in a new issue