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: (23 commits) [IPV4]: OOPS with NETLINK_FIB_LOOKUP netlink socket [NET]: Fix function put_cmsg() which may cause usr application memory overflow [ATM]: Spelling fixes [NETFILTER] ipv4: Spelling fixes [NETFILTER]: Spelling fixes [SCTP]: Spelling fixes [NETLABEL]: Spelling fixes [PKT_SCHED]: Spelling fixes [NET] net/core/: Spelling fixes [IPV6]: Spelling fixes [IRDA]: Spelling fixes [DCCP]: Spelling fixes [NET] include/net/: Spelling fixes [NET]: Correct two mistaken skb_reset_mac_header() conversions. [IPV4] ip_gre: set mac_header correctly in receive path [XFRM]: Audit function arguments misordered [IPSEC]: Avoid undefined shift operation when testing algorithm ID [IPV4] ARP: Remove not used code [TG3]: Endianness bugfix. [TG3]: Endianness annotations. ...
This commit is contained in:
commit
5b825ed22b
|
@ -171,8 +171,8 @@ static char *res_strings[] = {
|
|||
"packet purged",
|
||||
"packet ageing timeout",
|
||||
"channel ageing timeout",
|
||||
"calculated lenght error",
|
||||
"programmed lenght limit error",
|
||||
"calculated length error",
|
||||
"programmed length limit error",
|
||||
"aal5 crc32 error",
|
||||
"oam transp or transpc crc10 error",
|
||||
"reserved 25",
|
||||
|
|
|
@ -8189,6 +8189,7 @@ static int tg3_get_eeprom_len(struct net_device *dev)
|
|||
}
|
||||
|
||||
static int tg3_nvram_read(struct tg3 *tp, u32 offset, u32 *val);
|
||||
static int tg3_nvram_read_le(struct tg3 *tp, u32 offset, __le32 *val);
|
||||
static int tg3_nvram_read_swab(struct tg3 *tp, u32 offset, u32 *val);
|
||||
|
||||
static int tg3_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, u8 *data)
|
||||
|
@ -8196,7 +8197,8 @@ static int tg3_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
|
|||
struct tg3 *tp = netdev_priv(dev);
|
||||
int ret;
|
||||
u8 *pd;
|
||||
u32 i, offset, len, val, b_offset, b_count;
|
||||
u32 i, offset, len, b_offset, b_count;
|
||||
__le32 val;
|
||||
|
||||
if (tp->link_config.phy_is_low_power)
|
||||
return -EAGAIN;
|
||||
|
@ -8215,10 +8217,9 @@ static int tg3_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
|
|||
/* i.e. offset=1 len=2 */
|
||||
b_count = len;
|
||||
}
|
||||
ret = tg3_nvram_read(tp, offset-b_offset, &val);
|
||||
ret = tg3_nvram_read_le(tp, offset-b_offset, &val);
|
||||
if (ret)
|
||||
return ret;
|
||||
val = cpu_to_le32(val);
|
||||
memcpy(data, ((char*)&val) + b_offset, b_count);
|
||||
len -= b_count;
|
||||
offset += b_count;
|
||||
|
@ -8228,12 +8229,11 @@ static int tg3_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
|
|||
/* read bytes upto the last 4 byte boundary */
|
||||
pd = &data[eeprom->len];
|
||||
for (i = 0; i < (len - (len & 3)); i += 4) {
|
||||
ret = tg3_nvram_read(tp, offset + i, &val);
|
||||
ret = tg3_nvram_read_le(tp, offset + i, &val);
|
||||
if (ret) {
|
||||
eeprom->len += i;
|
||||
return ret;
|
||||
}
|
||||
val = cpu_to_le32(val);
|
||||
memcpy(pd + i, &val, 4);
|
||||
}
|
||||
eeprom->len += i;
|
||||
|
@ -8243,11 +8243,10 @@ static int tg3_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
|
|||
pd = &data[eeprom->len];
|
||||
b_count = len & 3;
|
||||
b_offset = offset + len - b_count;
|
||||
ret = tg3_nvram_read(tp, b_offset, &val);
|
||||
ret = tg3_nvram_read_le(tp, b_offset, &val);
|
||||
if (ret)
|
||||
return ret;
|
||||
val = cpu_to_le32(val);
|
||||
memcpy(pd, ((char*)&val), b_count);
|
||||
memcpy(pd, &val, b_count);
|
||||
eeprom->len += b_count;
|
||||
}
|
||||
return 0;
|
||||
|
@ -8259,8 +8258,9 @@ static int tg3_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
|
|||
{
|
||||
struct tg3 *tp = netdev_priv(dev);
|
||||
int ret;
|
||||
u32 offset, len, b_offset, odd_len, start, end;
|
||||
u32 offset, len, b_offset, odd_len;
|
||||
u8 *buf;
|
||||
__le32 start, end;
|
||||
|
||||
if (tp->link_config.phy_is_low_power)
|
||||
return -EAGAIN;
|
||||
|
@ -8273,10 +8273,9 @@ static int tg3_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
|
|||
|
||||
if ((b_offset = (offset & 3))) {
|
||||
/* adjustments to start on required 4 byte boundary */
|
||||
ret = tg3_nvram_read(tp, offset-b_offset, &start);
|
||||
ret = tg3_nvram_read_le(tp, offset-b_offset, &start);
|
||||
if (ret)
|
||||
return ret;
|
||||
start = cpu_to_le32(start);
|
||||
len += b_offset;
|
||||
offset &= ~3;
|
||||
if (len < 4)
|
||||
|
@ -8288,10 +8287,9 @@ static int tg3_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
|
|||
/* adjustments to end on required 4 byte boundary */
|
||||
odd_len = 1;
|
||||
len = (len + 3) & ~3;
|
||||
ret = tg3_nvram_read(tp, offset+len-4, &end);
|
||||
ret = tg3_nvram_read_le(tp, offset+len-4, &end);
|
||||
if (ret)
|
||||
return ret;
|
||||
end = cpu_to_le32(end);
|
||||
}
|
||||
|
||||
buf = data;
|
||||
|
@ -8734,7 +8732,8 @@ static void tg3_get_ethtool_stats (struct net_device *dev,
|
|||
|
||||
static int tg3_test_nvram(struct tg3 *tp)
|
||||
{
|
||||
u32 *buf, csum, magic;
|
||||
u32 csum, magic;
|
||||
__le32 *buf;
|
||||
int i, j, k, err = 0, size;
|
||||
|
||||
if (tg3_nvram_read_swab(tp, 0, &magic) != 0)
|
||||
|
@ -8771,21 +8770,19 @@ static int tg3_test_nvram(struct tg3 *tp)
|
|||
|
||||
err = -EIO;
|
||||
for (i = 0, j = 0; i < size; i += 4, j++) {
|
||||
u32 val;
|
||||
|
||||
if ((err = tg3_nvram_read(tp, i, &val)) != 0)
|
||||
if ((err = tg3_nvram_read_le(tp, i, &buf[j])) != 0)
|
||||
break;
|
||||
buf[j] = cpu_to_le32(val);
|
||||
}
|
||||
if (i < size)
|
||||
goto out;
|
||||
|
||||
/* Selfboot format */
|
||||
if ((cpu_to_be32(buf[0]) & TG3_EEPROM_MAGIC_FW_MSK) ==
|
||||
magic = swab32(le32_to_cpu(buf[0]));
|
||||
if ((magic & TG3_EEPROM_MAGIC_FW_MSK) ==
|
||||
TG3_EEPROM_MAGIC_FW) {
|
||||
u8 *buf8 = (u8 *) buf, csum8 = 0;
|
||||
|
||||
if ((cpu_to_be32(buf[0]) & TG3_EEPROM_SB_REVISION_MASK) ==
|
||||
if ((magic & TG3_EEPROM_SB_REVISION_MASK) ==
|
||||
TG3_EEPROM_SB_REVISION_2) {
|
||||
/* For rev 2, the csum doesn't include the MBA. */
|
||||
for (i = 0; i < TG3_EEPROM_SB_F1R2_MBA_OFF; i++)
|
||||
|
@ -8806,7 +8803,7 @@ static int tg3_test_nvram(struct tg3 *tp)
|
|||
goto out;
|
||||
}
|
||||
|
||||
if ((cpu_to_be32(buf[0]) & TG3_EEPROM_MAGIC_HW_MSK) ==
|
||||
if ((magic & TG3_EEPROM_MAGIC_HW_MSK) ==
|
||||
TG3_EEPROM_MAGIC_HW) {
|
||||
u8 data[NVRAM_SELFBOOT_DATA_SIZE];
|
||||
u8 parity[NVRAM_SELFBOOT_DATA_SIZE];
|
||||
|
@ -8852,12 +8849,12 @@ static int tg3_test_nvram(struct tg3 *tp)
|
|||
|
||||
/* Bootstrap checksum at offset 0x10 */
|
||||
csum = calc_crc((unsigned char *) buf, 0x10);
|
||||
if(csum != cpu_to_le32(buf[0x10/4]))
|
||||
if(csum != le32_to_cpu(buf[0x10/4]))
|
||||
goto out;
|
||||
|
||||
/* Manufacturing block starts at offset 0x74, checksum at 0xfc */
|
||||
csum = calc_crc((unsigned char *) &buf[0x74/4], 0x88);
|
||||
if (csum != cpu_to_le32(buf[0xfc/4]))
|
||||
if (csum != le32_to_cpu(buf[0xfc/4]))
|
||||
goto out;
|
||||
|
||||
err = 0;
|
||||
|
@ -10171,6 +10168,15 @@ static int tg3_nvram_read(struct tg3 *tp, u32 offset, u32 *val)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int tg3_nvram_read_le(struct tg3 *tp, u32 offset, __le32 *val)
|
||||
{
|
||||
u32 v;
|
||||
int res = tg3_nvram_read(tp, offset, &v);
|
||||
if (!res)
|
||||
*val = cpu_to_le32(v);
|
||||
return res;
|
||||
}
|
||||
|
||||
static int tg3_nvram_read_swab(struct tg3 *tp, u32 offset, u32 *val)
|
||||
{
|
||||
int err;
|
||||
|
@ -10188,13 +10194,14 @@ static int tg3_nvram_write_block_using_eeprom(struct tg3 *tp,
|
|||
u32 val;
|
||||
|
||||
for (i = 0; i < len; i += 4) {
|
||||
u32 addr, data;
|
||||
u32 addr;
|
||||
__le32 data;
|
||||
|
||||
addr = offset + i;
|
||||
|
||||
memcpy(&data, buf + i, 4);
|
||||
|
||||
tw32(GRC_EEPROM_DATA, cpu_to_le32(data));
|
||||
tw32(GRC_EEPROM_DATA, le32_to_cpu(data));
|
||||
|
||||
val = tr32(GRC_EEPROM_ADDR);
|
||||
tw32(GRC_EEPROM_ADDR, val | EEPROM_ADDR_COMPLETE);
|
||||
|
@ -10244,8 +10251,8 @@ static int tg3_nvram_write_block_unbuffered(struct tg3 *tp, u32 offset, u32 len,
|
|||
phy_addr = offset & ~pagemask;
|
||||
|
||||
for (j = 0; j < pagesize; j += 4) {
|
||||
if ((ret = tg3_nvram_read(tp, phy_addr + j,
|
||||
(u32 *) (tmp + j))))
|
||||
if ((ret = tg3_nvram_read_le(tp, phy_addr + j,
|
||||
(__le32 *) (tmp + j))))
|
||||
break;
|
||||
}
|
||||
if (ret)
|
||||
|
@ -10289,10 +10296,11 @@ static int tg3_nvram_write_block_unbuffered(struct tg3 *tp, u32 offset, u32 len,
|
|||
break;
|
||||
|
||||
for (j = 0; j < pagesize; j += 4) {
|
||||
u32 data;
|
||||
__be32 data;
|
||||
|
||||
data = *((u32 *) (tmp + j));
|
||||
tw32(NVRAM_WRDATA, cpu_to_be32(data));
|
||||
data = *((__be32 *) (tmp + j));
|
||||
/* swab32(le32_to_cpu(data)), actually */
|
||||
tw32(NVRAM_WRDATA, be32_to_cpu(data));
|
||||
|
||||
tw32(NVRAM_ADDR, phy_addr + j);
|
||||
|
||||
|
@ -10326,10 +10334,11 @@ static int tg3_nvram_write_block_buffered(struct tg3 *tp, u32 offset, u32 len,
|
|||
int i, ret = 0;
|
||||
|
||||
for (i = 0; i < len; i += 4, offset += 4) {
|
||||
u32 data, page_off, phy_addr, nvram_cmd;
|
||||
u32 page_off, phy_addr, nvram_cmd;
|
||||
__be32 data;
|
||||
|
||||
memcpy(&data, buf + i, 4);
|
||||
tw32(NVRAM_WRDATA, cpu_to_be32(data));
|
||||
tw32(NVRAM_WRDATA, be32_to_cpu(data));
|
||||
|
||||
page_off = offset % tp->nvram_pagesize;
|
||||
|
||||
|
@ -10831,6 +10840,7 @@ static void __devinit tg3_read_partno(struct tg3 *tp)
|
|||
vpd_cap = pci_find_capability(tp->pdev, PCI_CAP_ID_VPD);
|
||||
for (i = 0; i < 256; i += 4) {
|
||||
u32 tmp, j = 0;
|
||||
__le32 v;
|
||||
u16 tmp16;
|
||||
|
||||
pci_write_config_word(tp->pdev, vpd_cap + PCI_VPD_ADDR,
|
||||
|
@ -10847,8 +10857,8 @@ static void __devinit tg3_read_partno(struct tg3 *tp)
|
|||
|
||||
pci_read_config_dword(tp->pdev, vpd_cap + PCI_VPD_DATA,
|
||||
&tmp);
|
||||
tmp = cpu_to_le32(tmp);
|
||||
memcpy(&vpd_data[i], &tmp, 4);
|
||||
v = cpu_to_le32(tmp);
|
||||
memcpy(&vpd_data[i], &v, 4);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -10941,11 +10951,11 @@ static void __devinit tg3_read_fw_ver(struct tg3 *tp)
|
|||
|
||||
offset = offset + ver_offset - start;
|
||||
for (i = 0; i < 16; i += 4) {
|
||||
if (tg3_nvram_read(tp, offset + i, &val))
|
||||
__le32 v;
|
||||
if (tg3_nvram_read_le(tp, offset + i, &v))
|
||||
return;
|
||||
|
||||
val = le32_to_cpu(val);
|
||||
memcpy(tp->fw_ver + i, &val, 4);
|
||||
memcpy(tp->fw_ver + i, &v, 4);
|
||||
}
|
||||
|
||||
if (!(tp->tg3_flags & TG3_FLAG_ENABLE_ASF) ||
|
||||
|
@ -10983,19 +10993,19 @@ static void __devinit tg3_read_fw_ver(struct tg3 *tp)
|
|||
tp->fw_ver[bcnt++] = ' ';
|
||||
|
||||
for (i = 0; i < 4; i++) {
|
||||
if (tg3_nvram_read(tp, offset, &val))
|
||||
__le32 v;
|
||||
if (tg3_nvram_read_le(tp, offset, &v))
|
||||
return;
|
||||
|
||||
val = le32_to_cpu(val);
|
||||
offset += sizeof(val);
|
||||
offset += sizeof(v);
|
||||
|
||||
if (bcnt > TG3_VER_SIZE - sizeof(val)) {
|
||||
memcpy(&tp->fw_ver[bcnt], &val, TG3_VER_SIZE - bcnt);
|
||||
if (bcnt > TG3_VER_SIZE - sizeof(v)) {
|
||||
memcpy(&tp->fw_ver[bcnt], &v, TG3_VER_SIZE - bcnt);
|
||||
break;
|
||||
}
|
||||
|
||||
memcpy(&tp->fw_ver[bcnt], &val, sizeof(val));
|
||||
bcnt += sizeof(val);
|
||||
memcpy(&tp->fw_ver[bcnt], &v, sizeof(v));
|
||||
bcnt += sizeof(v);
|
||||
}
|
||||
|
||||
tp->fw_ver[TG3_VER_SIZE - 1] = 0;
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#define AX25_P_ATALK 0xca /* Appletalk */
|
||||
#define AX25_P_ATALK_ARP 0xcb /* Appletalk ARP */
|
||||
#define AX25_P_IP 0xcc /* ARPA Internet Protocol */
|
||||
#define AX25_P_ARP 0xcd /* ARPA Adress Resolution */
|
||||
#define AX25_P_ARP 0xcd /* ARPA Address Resolution */
|
||||
#define AX25_P_FLEXNET 0xce /* FlexNet */
|
||||
#define AX25_P_NETROM 0xcf /* NET/ROM */
|
||||
#define AX25_P_TEXT 0xF0 /* No layer 3 protocol impl. */
|
||||
|
|
|
@ -23,7 +23,7 @@ struct ip6_tnl {
|
|||
struct net_device *dev; /* virtual device associated with tunnel */
|
||||
struct net_device_stats stat; /* statistics for tunnel device */
|
||||
int recursion; /* depth of hard_start_xmit recursion */
|
||||
struct ip6_tnl_parm parms; /* tunnel configuration paramters */
|
||||
struct ip6_tnl_parm parms; /* tunnel configuration parameters */
|
||||
struct flowi fl; /* flowi template for xmit */
|
||||
struct dst_entry *dst_cache; /* cached dst */
|
||||
u32 dst_cookie;
|
||||
|
|
|
@ -80,7 +80,7 @@ typedef struct discovery_t {
|
|||
irda_queue_t q; /* Must be first! */
|
||||
|
||||
discinfo_t data; /* Basic discovery information */
|
||||
int name_len; /* Lenght of nickname */
|
||||
int name_len; /* Length of nickname */
|
||||
|
||||
LAP_REASON condition; /* More info about the discovery */
|
||||
int gen_addr_bit; /* Need to generate a new device
|
||||
|
|
|
@ -301,7 +301,7 @@ struct sctp_sock {
|
|||
/* The default SACK delay timeout for new associations. */
|
||||
__u32 sackdelay;
|
||||
|
||||
/* Flags controling Heartbeat, SACK delay, and Path MTU Discovery. */
|
||||
/* Flags controlling Heartbeat, SACK delay, and Path MTU Discovery. */
|
||||
__u32 param_flags;
|
||||
|
||||
struct sctp_initmsg initmsg;
|
||||
|
@ -955,7 +955,7 @@ struct sctp_transport {
|
|||
/* PMTU : The current known path MTU. */
|
||||
__u32 pathmtu;
|
||||
|
||||
/* Flags controling Heartbeat, SACK delay, and Path MTU Discovery. */
|
||||
/* Flags controlling Heartbeat, SACK delay, and Path MTU Discovery. */
|
||||
__u32 param_flags;
|
||||
|
||||
/* The number of times INIT has been sent on this transport. */
|
||||
|
@ -1638,7 +1638,7 @@ struct sctp_association {
|
|||
*/
|
||||
__u32 pathmtu;
|
||||
|
||||
/* Flags controling Heartbeat, SACK delay, and Path MTU Discovery. */
|
||||
/* Flags controlling Heartbeat, SACK delay, and Path MTU Discovery. */
|
||||
__u32 param_flags;
|
||||
|
||||
/* SACK delay timeout */
|
||||
|
|
|
@ -124,7 +124,7 @@ int ax25_rx_iframe(ax25_cb *ax25, struct sk_buff *skb)
|
|||
}
|
||||
|
||||
skb_pull(skb, 1); /* Remove PID */
|
||||
skb_reset_mac_header(skb);
|
||||
skb->mac_header = skb->network_header;
|
||||
skb_reset_network_header(skb);
|
||||
skb->dev = ax25->ax25_dev->dev;
|
||||
skb->pkt_type = PACKET_HOST;
|
||||
|
|
|
@ -254,6 +254,8 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
|
|||
if (copy_to_user(CMSG_COMPAT_DATA(cm), data, cmlen - sizeof(struct compat_cmsghdr)))
|
||||
return -EFAULT;
|
||||
cmlen = CMSG_COMPAT_SPACE(len);
|
||||
if (kmsg->msg_controllen < cmlen)
|
||||
cmlen = kmsg->msg_controllen;
|
||||
kmsg->msg_control += cmlen;
|
||||
kmsg->msg_controllen -= cmlen;
|
||||
return 0;
|
||||
|
|
|
@ -2819,7 +2819,7 @@ void dev_set_allmulti(struct net_device *dev, int inc)
|
|||
/*
|
||||
* Upload unicast and multicast address lists to device and
|
||||
* configure RX filtering. When the device doesn't support unicast
|
||||
* filtering it is put in promiscous mode while unicast addresses
|
||||
* filtering it is put in promiscuous mode while unicast addresses
|
||||
* are present.
|
||||
*/
|
||||
void __dev_set_rx_mode(struct net_device *dev)
|
||||
|
|
|
@ -196,6 +196,8 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
|
|||
if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
|
||||
goto out;
|
||||
cmlen = CMSG_SPACE(len);
|
||||
if (msg->msg_controllen < cmlen)
|
||||
cmlen = msg->msg_controllen;
|
||||
msg->msg_control += cmlen;
|
||||
msg->msg_controllen -= cmlen;
|
||||
err = 0;
|
||||
|
|
|
@ -71,7 +71,7 @@ struct dccp_ackvec {
|
|||
* @dccpavr_ack_ackno - sequence number being acknowledged
|
||||
* @dccpavr_ack_ptr - pointer into dccpav_buf where this record starts
|
||||
* @dccpavr_ack_nonce - dccpav_ack_nonce at the time this record was sent
|
||||
* @dccpavr_sent_len - lenght of the record in dccpav_buf
|
||||
* @dccpavr_sent_len - length of the record in dccpav_buf
|
||||
*/
|
||||
struct dccp_ackvec_record {
|
||||
struct list_head dccpavr_node;
|
||||
|
|
|
@ -239,7 +239,7 @@ static void ccid3_hc_tx_no_feedback_timer(unsigned long data)
|
|||
ccid3_tx_state_name(hctx->ccid3hctx_state),
|
||||
(unsigned)(hctx->ccid3hctx_x >> 6));
|
||||
/* The value of R is still undefined and so we can not recompute
|
||||
* the timout value. Keep initial value as per [RFC 4342, 5]. */
|
||||
* the timeout value. Keep initial value as per [RFC 4342, 5]. */
|
||||
t_nfb = TFRC_INITIAL_TIMEOUT;
|
||||
ccid3_update_send_interval(hctx);
|
||||
break;
|
||||
|
|
|
@ -706,7 +706,7 @@ static int arp_process(struct sk_buff *skb)
|
|||
struct arphdr *arp;
|
||||
unsigned char *arp_ptr;
|
||||
struct rtable *rt;
|
||||
unsigned char *sha, *tha;
|
||||
unsigned char *sha;
|
||||
__be32 sip, tip;
|
||||
u16 dev_type = dev->type;
|
||||
int addr_type;
|
||||
|
@ -771,7 +771,6 @@ static int arp_process(struct sk_buff *skb)
|
|||
arp_ptr += dev->addr_len;
|
||||
memcpy(&sip, arp_ptr, 4);
|
||||
arp_ptr += 4;
|
||||
tha = arp_ptr;
|
||||
arp_ptr += dev->addr_len;
|
||||
memcpy(&tip, arp_ptr, 4);
|
||||
/*
|
||||
|
|
|
@ -804,10 +804,13 @@ static void nl_fib_input(struct sk_buff *skb)
|
|||
|
||||
nlh = nlmsg_hdr(skb);
|
||||
if (skb->len < NLMSG_SPACE(0) || skb->len < nlh->nlmsg_len ||
|
||||
nlh->nlmsg_len < NLMSG_LENGTH(sizeof(*frn))) {
|
||||
kfree_skb(skb);
|
||||
nlh->nlmsg_len < NLMSG_LENGTH(sizeof(*frn)))
|
||||
return;
|
||||
}
|
||||
|
||||
skb = skb_clone(skb, GFP_KERNEL);
|
||||
if (skb == NULL)
|
||||
return;
|
||||
nlh = nlmsg_hdr(skb);
|
||||
|
||||
frn = (struct fib_result_nl *) NLMSG_DATA(nlh);
|
||||
tb = fib_get_table(frn->tb_id_in);
|
||||
|
|
|
@ -613,7 +613,7 @@ static int ipgre_rcv(struct sk_buff *skb)
|
|||
offset += 4;
|
||||
}
|
||||
|
||||
skb_reset_mac_header(skb);
|
||||
skb->mac_header = skb->network_header;
|
||||
__pskb_pull(skb, offset);
|
||||
skb_reset_network_header(skb);
|
||||
skb_postpull_rcsum(skb, skb_transport_header(skb), offset);
|
||||
|
|
|
@ -165,7 +165,7 @@ static int mangle_content_len(struct sk_buff *skb,
|
|||
|
||||
dataoff = ip_hdrlen(skb) + sizeof(struct udphdr);
|
||||
|
||||
/* Get actual SDP lenght */
|
||||
/* Get actual SDP length */
|
||||
if (ct_sip_get_info(ct, dptr, skb->len - dataoff, &matchoff,
|
||||
&matchlen, POS_SDP_HEADER) > 0) {
|
||||
|
||||
|
|
|
@ -612,7 +612,7 @@ void ndisc_send_rs(struct net_device *dev, struct in6_addr *saddr,
|
|||
* optimistic addresses, but we may send the solicitation
|
||||
* if we don't include the sllao. So here we check
|
||||
* if our address is optimistic, and if so, we
|
||||
* supress the inclusion of the sllao.
|
||||
* suppress the inclusion of the sllao.
|
||||
*/
|
||||
if (send_sllao) {
|
||||
struct inet6_ifaddr *ifp = ipv6_get_ifaddr(saddr, dev, 1);
|
||||
|
|
|
@ -496,7 +496,7 @@ static int ircomm_param_poll(void *instance, irda_param_t *param, int get)
|
|||
IRDA_ASSERT(self != NULL, return -1;);
|
||||
IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
|
||||
|
||||
/* Poll parameters are always of lenght 0 (just a signal) */
|
||||
/* Poll parameters are always of length 0 (just a signal) */
|
||||
if (!get) {
|
||||
/* Respond with DTE line settings */
|
||||
ircomm_param_request(self, IRCOMM_DTE, TRUE);
|
||||
|
|
|
@ -342,7 +342,7 @@ static void irlan_eth_set_multicast_list(struct net_device *dev)
|
|||
|
||||
if (dev->flags & IFF_PROMISC) {
|
||||
/* Enable promiscuous mode */
|
||||
IRDA_WARNING("Promiscous mode not implemented by IrLAN!\n");
|
||||
IRDA_WARNING("Promiscuous mode not implemented by IrLAN!\n");
|
||||
}
|
||||
else if ((dev->flags & IFF_ALLMULTI) || dev->mc_count > HW_MAX_ADDRS) {
|
||||
/* Disable promiscuous mode, use normal mode. */
|
||||
|
|
|
@ -144,7 +144,7 @@ void irlap_send_snrm_frame(struct irlap_cb *self, struct qos_info *qos)
|
|||
frame->control = SNRM_CMD | PF_BIT;
|
||||
|
||||
/*
|
||||
* If we are establishing a connection then insert QoS paramerters
|
||||
* If we are establishing a connection then insert QoS parameters
|
||||
*/
|
||||
if (qos) {
|
||||
skb_put(tx_skb, 9); /* 25 left */
|
||||
|
|
|
@ -133,7 +133,7 @@ static int irda_insert_integer(void *self, __u8 *buf, int len, __u8 pi,
|
|||
int err;
|
||||
|
||||
p.pi = pi; /* In case handler needs to know */
|
||||
p.pl = type & PV_MASK; /* The integer type codes the lenght as well */
|
||||
p.pl = type & PV_MASK; /* The integer type codes the length as well */
|
||||
p.pv.i = 0; /* Clear value */
|
||||
|
||||
/* Call handler for this parameter */
|
||||
|
@ -142,7 +142,7 @@ static int irda_insert_integer(void *self, __u8 *buf, int len, __u8 pi,
|
|||
return err;
|
||||
|
||||
/*
|
||||
* If parameter lenght is still 0, then (1) this is an any length
|
||||
* If parameter length is still 0, then (1) this is an any length
|
||||
* integer, and (2) the handler function does not care which length
|
||||
* we choose to use, so we pick the one the gives the fewest bytes.
|
||||
*/
|
||||
|
@ -206,11 +206,11 @@ static int irda_extract_integer(void *self, __u8 *buf, int len, __u8 pi,
|
|||
{
|
||||
irda_param_t p;
|
||||
int n = 0;
|
||||
int extract_len; /* Real lenght we extract */
|
||||
int extract_len; /* Real length we extract */
|
||||
int err;
|
||||
|
||||
p.pi = pi; /* In case handler needs to know */
|
||||
p.pl = buf[1]; /* Extract lenght of value */
|
||||
p.pl = buf[1]; /* Extract length of value */
|
||||
p.pv.i = 0; /* Clear value */
|
||||
extract_len = p.pl; /* Default : extract all */
|
||||
|
||||
|
@ -297,7 +297,7 @@ static int irda_extract_string(void *self, __u8 *buf, int len, __u8 pi,
|
|||
IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
|
||||
|
||||
p.pi = pi; /* In case handler needs to know */
|
||||
p.pl = buf[1]; /* Extract lenght of value */
|
||||
p.pl = buf[1]; /* Extract length of value */
|
||||
|
||||
IRDA_DEBUG(2, "%s(), pi=%#x, pl=%d\n", __FUNCTION__,
|
||||
p.pi, p.pl);
|
||||
|
@ -339,7 +339,7 @@ static int irda_extract_octseq(void *self, __u8 *buf, int len, __u8 pi,
|
|||
irda_param_t p;
|
||||
|
||||
p.pi = pi; /* In case handler needs to know */
|
||||
p.pl = buf[1]; /* Extract lenght of value */
|
||||
p.pl = buf[1]; /* Extract length of value */
|
||||
|
||||
/* Check if buffer is long enough for parsing */
|
||||
if (len < (2+p.pl)) {
|
||||
|
|
|
@ -238,7 +238,7 @@ async_bump(struct net_device *dev,
|
|||
skb_reserve(newskb, 1);
|
||||
|
||||
if(docopy) {
|
||||
/* Copy data without CRC (lenght already checked) */
|
||||
/* Copy data without CRC (length already checked) */
|
||||
skb_copy_to_linear_data(newskb, rx_buff->data,
|
||||
rx_buff->len - 2);
|
||||
/* Deliver this skb */
|
||||
|
|
|
@ -2784,12 +2784,22 @@ static struct sadb_msg *pfkey_get_base_msg(struct sk_buff *skb, int *errp)
|
|||
|
||||
static inline int aalg_tmpl_set(struct xfrm_tmpl *t, struct xfrm_algo_desc *d)
|
||||
{
|
||||
return t->aalgos & (1 << d->desc.sadb_alg_id);
|
||||
unsigned int id = d->desc.sadb_alg_id;
|
||||
|
||||
if (id >= sizeof(t->aalgos) * 8)
|
||||
return 0;
|
||||
|
||||
return (t->aalgos >> id) & 1;
|
||||
}
|
||||
|
||||
static inline int ealg_tmpl_set(struct xfrm_tmpl *t, struct xfrm_algo_desc *d)
|
||||
{
|
||||
return t->ealgos & (1 << d->desc.sadb_alg_id);
|
||||
unsigned int id = d->desc.sadb_alg_id;
|
||||
|
||||
if (id >= sizeof(t->ealgos) * 8)
|
||||
return 0;
|
||||
|
||||
return (t->ealgos >> id) & 1;
|
||||
}
|
||||
|
||||
static int count_ah_combs(struct xfrm_tmpl *t)
|
||||
|
|
|
@ -427,7 +427,6 @@ static const struct header_ops ieee80211_header_ops = {
|
|||
void ieee80211_if_setup(struct net_device *dev)
|
||||
{
|
||||
ether_setup(dev);
|
||||
dev->header_ops = &ieee80211_header_ops;
|
||||
dev->hard_start_xmit = ieee80211_subif_start_xmit;
|
||||
dev->wireless_handlers = &ieee80211_iw_handler_def;
|
||||
dev->set_multicast_list = ieee80211_set_multicast_list;
|
||||
|
|
|
@ -60,11 +60,11 @@ void ieee80211_rate_control_unregister(struct rate_control_ops *ops)
|
|||
list_for_each_entry(alg, &rate_ctrl_algs, list) {
|
||||
if (alg->ops == ops) {
|
||||
list_del(&alg->list);
|
||||
kfree(alg);
|
||||
break;
|
||||
}
|
||||
}
|
||||
mutex_unlock(&rate_ctrl_mutex);
|
||||
kfree(alg);
|
||||
}
|
||||
EXPORT_SYMBOL(ieee80211_rate_control_unregister);
|
||||
|
||||
|
|
|
@ -808,12 +808,8 @@ static void ieee80211_associated(struct net_device *dev,
|
|||
sta_info_put(sta);
|
||||
}
|
||||
if (disassoc) {
|
||||
union iwreq_data wrqu;
|
||||
memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
|
||||
wrqu.ap_addr.sa_family = ARPHRD_ETHER;
|
||||
wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
|
||||
mod_timer(&ifsta->timer, jiffies +
|
||||
IEEE80211_MONITORING_INTERVAL + 30 * HZ);
|
||||
ifsta->state = IEEE80211_DISABLED;
|
||||
ieee80211_set_associated(dev, ifsta, 0);
|
||||
} else {
|
||||
mod_timer(&ifsta->timer, jiffies +
|
||||
IEEE80211_MONITORING_INTERVAL);
|
||||
|
|
|
@ -187,7 +187,7 @@ static const struct sip_header_nfo ct_sip_hdrs[] = {
|
|||
}
|
||||
};
|
||||
|
||||
/* get line lenght until first CR or LF seen. */
|
||||
/* get line length until first CR or LF seen. */
|
||||
int ct_sip_lnlen(const char *line, const char *limit)
|
||||
{
|
||||
const char *k = line;
|
||||
|
@ -236,7 +236,7 @@ static int digits_len(struct nf_conn *ct, const char *dptr,
|
|||
return len;
|
||||
}
|
||||
|
||||
/* get digits lenght, skiping blank spaces. */
|
||||
/* get digits length, skipping blank spaces. */
|
||||
static int skp_digits_len(struct nf_conn *ct, const char *dptr,
|
||||
const char *limit, int *shift)
|
||||
{
|
||||
|
|
|
@ -71,7 +71,7 @@ static const struct nla_policy netlbl_mgmt_genl_policy[NLBL_MGMT_A_MAX + 1] = {
|
|||
};
|
||||
|
||||
/*
|
||||
* NetLabel Misc Managment Functions
|
||||
* NetLabel Misc Management Functions
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
|
@ -56,7 +56,7 @@ int nr_rx_ip(struct sk_buff *skb, struct net_device *dev)
|
|||
|
||||
/* Spoof incoming device */
|
||||
skb->dev = dev;
|
||||
skb_reset_mac_header(skb);
|
||||
skb->mac_header = skb->network_header;
|
||||
skb_reset_network_header(skb);
|
||||
skb->pkt_type = PACKET_HOST;
|
||||
|
||||
|
|
|
@ -160,7 +160,7 @@ struct hfsc_class
|
|||
u64 cl_vtoff; /* inter-period cumulative vt offset */
|
||||
u64 cl_cvtmax; /* max child's vt in the last period */
|
||||
u64 cl_cvtoff; /* cumulative cvtmax of all periods */
|
||||
u64 cl_pcvtoff; /* parent's cvtoff at initalization
|
||||
u64 cl_pcvtoff; /* parent's cvtoff at initialization
|
||||
time */
|
||||
|
||||
struct internal_sc cl_rsc; /* internal real-time service curve */
|
||||
|
|
|
@ -286,7 +286,7 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc,
|
|||
|
||||
sctp_addto_chunk(retval, sizeof(ecap_param), &ecap_param);
|
||||
|
||||
/* Add the supported extensions paramter. Be nice and add this
|
||||
/* Add the supported extensions parameter. Be nice and add this
|
||||
* fist before addiding the parameters for the extensions themselves
|
||||
*/
|
||||
if (num_ext) {
|
||||
|
@ -2859,7 +2859,7 @@ struct sctp_chunk *sctp_process_asconf(struct sctp_association *asoc,
|
|||
chunk_len -= length;
|
||||
|
||||
/* Skip the address parameter and store a pointer to the first
|
||||
* asconf paramter.
|
||||
* asconf parameter.
|
||||
*/
|
||||
length = ntohs(addr_param->v4.param_hdr.length);
|
||||
asconf_param = (sctp_addip_param_t *)((void *)addr_param + length);
|
||||
|
@ -2868,7 +2868,7 @@ struct sctp_chunk *sctp_process_asconf(struct sctp_association *asoc,
|
|||
/* create an ASCONF_ACK chunk.
|
||||
* Based on the definitions of parameters, we know that the size of
|
||||
* ASCONF_ACK parameters are less than or equal to the twice of ASCONF
|
||||
* paramters.
|
||||
* parameters.
|
||||
*/
|
||||
asconf_ack = sctp_make_asconf_ack(asoc, serial, chunk_len * 2);
|
||||
if (!asconf_ack)
|
||||
|
@ -3062,7 +3062,7 @@ int sctp_process_asconf_ack(struct sctp_association *asoc,
|
|||
asconf_len -= length;
|
||||
|
||||
/* Skip the address parameter in the last asconf sent and store a
|
||||
* pointer to the first asconf paramter.
|
||||
* pointer to the first asconf parameter.
|
||||
*/
|
||||
length = ntohs(addr_param->v4.param_hdr.length);
|
||||
asconf_param = (sctp_addip_param_t *)((void *)addr_param + length);
|
||||
|
|
|
@ -2162,7 +2162,7 @@ xfrm_audit_policy_add(struct xfrm_policy *xp, int result, u32 auid, u32 sid)
|
|||
|
||||
if (audit_enabled == 0)
|
||||
return;
|
||||
audit_buf = xfrm_audit_start(sid, auid);
|
||||
audit_buf = xfrm_audit_start(auid, sid);
|
||||
if (audit_buf == NULL)
|
||||
return;
|
||||
audit_log_format(audit_buf, " op=SPD-add res=%u", result);
|
||||
|
@ -2179,7 +2179,7 @@ xfrm_audit_policy_delete(struct xfrm_policy *xp, int result, u32 auid, u32 sid)
|
|||
|
||||
if (audit_enabled == 0)
|
||||
return;
|
||||
audit_buf = xfrm_audit_start(sid, auid);
|
||||
audit_buf = xfrm_audit_start(auid, sid);
|
||||
if (audit_buf == NULL)
|
||||
return;
|
||||
audit_log_format(audit_buf, " op=SPD-delete res=%u", result);
|
||||
|
|
|
@ -2033,7 +2033,7 @@ xfrm_audit_state_add(struct xfrm_state *x, int result, u32 auid, u32 sid)
|
|||
|
||||
if (audit_enabled == 0)
|
||||
return;
|
||||
audit_buf = xfrm_audit_start(sid, auid);
|
||||
audit_buf = xfrm_audit_start(auid, sid);
|
||||
if (audit_buf == NULL)
|
||||
return;
|
||||
audit_log_format(audit_buf, " op=SAD-add res=%u",result);
|
||||
|
@ -2053,7 +2053,7 @@ xfrm_audit_state_delete(struct xfrm_state *x, int result, u32 auid, u32 sid)
|
|||
|
||||
if (audit_enabled == 0)
|
||||
return;
|
||||
audit_buf = xfrm_audit_start(sid, auid);
|
||||
audit_buf = xfrm_audit_start(auid, sid);
|
||||
if (audit_buf == NULL)
|
||||
return;
|
||||
audit_log_format(audit_buf, " op=SAD-delete res=%u",result);
|
||||
|
|
Loading…
Reference in a new issue