From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/net/mv643xx_eth.c | 7 ---- net/ieee80211/softmac/ieee80211softmac_wx.c | 22 +------------- net/sctp/sm_statefuns.c | 27 ------------------ scripts/mod/file2alias.c | 4 ++ 4 files changed, 6 insertions(+), 54 deletions(-) diff -puN scripts/mod/file2alias.c~git-net-fixup scripts/mod/file2alias.c --- a/scripts/mod/file2alias.c~git-net-fixup +++ a/scripts/mod/file2alias.c @@ -648,6 +648,10 @@ void handle_moddevtable(struct module *m do_table(symval, sym->st_size, sizeof(struct sdio_device_id), "sdio", do_sdio_entry, mod); + else if (sym_is(symname, "__mod_ssb_device_table")) + do_table(symval, sym->st_size, + sizeof(struct ssb_device_id), "ssb", + do_ssb_entry, mod); free(zeros); } diff -puN drivers/net/mv643xx_eth.c~git-net-fixup drivers/net/mv643xx_eth.c --- a/drivers/net/mv643xx_eth.c~git-net-fixup +++ a/drivers/net/mv643xx_eth.c @@ -1414,9 +1414,6 @@ static int mv643xx_eth_probe(struct plat goto out; p = dev->dev_addr; - printk(KERN_NOTICE - "%s: port %d with MAC address %s\n", - dev->name, port_num, print_mac(mac, p)); if (dev->features & NETIF_F_SG) printk(KERN_NOTICE "%s: Scatter Gather Enabled\n", dev->name); @@ -2746,10 +2743,6 @@ static const struct ethtool_ops mv643xx_ .get_sset_count = mv643xx_get_sset_count, .get_ethtool_stats = mv643xx_get_ethtool_stats, .get_strings = mv643xx_get_strings, -<<<<<<< HEAD/drivers/net/mv643xx_eth.c -======= - .get_ethtool_stats = mv643xx_get_ethtool_stats, ->>>>>>> /drivers/net/mv643xx_eth.c .nway_reset = mv643xx_eth_nway_restart, }; diff -puN net/ieee80211/softmac/ieee80211softmac_wx.c~git-net-fixup net/ieee80211/softmac/ieee80211softmac_wx.c --- a/net/ieee80211/softmac/ieee80211softmac_wx.c~git-net-fixup +++ a/net/ieee80211/softmac/ieee80211softmac_wx.c @@ -78,26 +78,9 @@ check_assoc_again: mutex_lock(&sm->associnfo.mutex); if((sm->associnfo.associating || sm->associnfo.associated) && (data->essid.flags && data->essid.length)) { -<<<<<<< HEAD/net/ieee80211/softmac/ieee80211softmac_wx.c - dprintk(KERN_INFO PFX "Canceling existing associate request!\n"); - /* Cancel assoc work */ - cancel_delayed_work(&sm->associnfo.work); - /* We don't have to do this, but it's a little cleaner */ - list_for_each_entry(authptr, &sm->auth_queue, list) - cancel_delayed_work(&authptr->work); - sm->associnfo.bssvalid = 0; - sm->associnfo.bssfixed = 0; - sm->associnfo.associating = 0; - sm->associnfo.associated = 0; - /* We must unlock to avoid deadlocks with the assoc workqueue - * on the associnfo.mutex */ - mutex_unlock(&sm->associnfo.mutex); - flush_scheduled_work(); - /* Avoid race! Check assoc status again. Maybe someone started an - * association while we flushed. */ - goto check_assoc_again; -======= /* Get the associating network */ + struct ieee80211softmac_network *n; + n = ieee80211softmac_get_network_by_bssid(sm, sm->associnfo.bssid); if(n && n->essid.len == data->essid.length && !memcmp(n->essid.data, extra, n->essid.len)) { @@ -123,7 +106,6 @@ check_assoc_again: * association while we flushed. */ goto check_assoc_again; } ->>>>>>> /net/ieee80211/softmac/ieee80211softmac_wx.c } sm->associnfo.static_essid = 0; diff -puN net/sctp/sm_statefuns.c~git-net-fixup net/sctp/sm_statefuns.c --- a/net/sctp/sm_statefuns.c~git-net-fixup +++ a/net/sctp/sm_statefuns.c @@ -131,7 +131,6 @@ static sctp_disposition_t sctp_sf_violat void *arg, sctp_cmd_seq_t *commands); -<<<<<<< HEAD/net/sctp/sm_statefuns.c static sctp_disposition_t sctp_sf_violation_chunk( const struct sctp_endpoint *ep, const struct sctp_association *asoc, @@ -139,13 +138,11 @@ static sctp_disposition_t sctp_sf_violat void *arg, sctp_cmd_seq_t *commands); -======= static sctp_ierror_t sctp_sf_authenticate(const struct sctp_endpoint *ep, const struct sctp_association *asoc, const sctp_subtype_t type, struct sctp_chunk *chunk); ->>>>>>> /net/sctp/sm_statefuns.c /* Small helper function that checks if the chunk length * is of the appropriate length. The 'required_length' argument * is set to be the size of a specific chunk we are testing. @@ -4072,28 +4069,9 @@ static sctp_disposition_t sctp_sf_abort_ if (!abort) goto nomem; -<<<<<<< HEAD/net/sctp/sm_statefuns.c if (asoc) { sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(abort)); SCTP_INC_STATS(SCTP_MIB_OUTCTRLCHUNKS); -======= - /* SCTP-AUTH, Section 6.3: - * It should be noted that if the receiver wants to tear - * down an association in an authenticated way only, the - * handling of malformed packets should not result in - * tearing down the association. - * - * This means that if we only want to abort associations - * in an authenticated way (i.e AUTH+ABORT), then we - * can't destory this association just becuase the packet - * was malformed. - */ - if (sctp_auth_recv_cid(SCTP_CID_ABORT, asoc)) - goto discard; - - sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(abort)); - SCTP_INC_STATS(SCTP_MIB_OUTCTRLCHUNKS); ->>>>>>> /net/sctp/sm_statefuns.c if (asoc->state <= SCTP_STATE_COOKIE_ECHOED) { sctp_add_cmd_sf(commands, SCTP_CMD_TIMER_STOP, @@ -4128,12 +4106,7 @@ static sctp_disposition_t sctp_sf_abort_ SCTP_INC_STATS(SCTP_MIB_OUTCTRLCHUNKS); } -<<<<<<< HEAD/net/sctp/sm_statefuns.c sctp_sf_pdiscard(ep, asoc, SCTP_ST_CHUNK(0), arg, commands); -======= -discard: - sctp_add_cmd_sf(commands, SCTP_CMD_DISCARD_PACKET, SCTP_NULL()); ->>>>>>> /net/sctp/sm_statefuns.c SCTP_INC_STATS(SCTP_MIB_ABORTEDS); _