| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1380540373-25352-6-git-send-email-treding@nvidia.com> Date: Mon, 30 Sep 2013 13:26:08 +0200 From: Thierry Reding <thierry.reding@...il.com> To: "David S. Miller" <davem@...emloft.net> Cc: netdev@...r.kernel.org, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org Subject: linux-next: manual merge of the net-next tree Today's linux-next merge of the net-next tree got conflicts in arch/h8300/include/uapi/asm/socket.h drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h include/net/secure_seq.h I removed the h8300 file and I fixed up the other two (see below). Please check if the resolution looks correct. Thanks, Thierry --- diff --cc drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h index 74156f8,5bc0276..7f1340d --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h @@@ -132,35 -132,33 +132,34 @@@ struct pktq *brcmf_bus_gettxq(struct br * interface functions from common layer */ - extern bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, - struct sk_buff *pkt, int prec); + bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, struct sk_buff *pkt, + int prec); /* Receive frame for delivery to OS. Callee disposes of rxp. */ - extern void brcmf_rx_frames(struct device *dev, struct sk_buff_head *rxlist); + void brcmf_rx_frames(struct device *dev, struct sk_buff_head *rxlist); /* Indication from bus module regarding presence/insertion of dongle. */ - extern int brcmf_attach(uint bus_hdrlen, struct device *dev); + int brcmf_attach(uint bus_hdrlen, struct device *dev); /* Indication from bus module regarding removal/absence of dongle */ - extern void brcmf_detach(struct device *dev); + void brcmf_detach(struct device *dev); /* Indication from bus module that dongle should be reset */ - extern void brcmf_dev_reset(struct device *dev); + void brcmf_dev_reset(struct device *dev); /* Indication from bus module to change flow-control state */ - extern void brcmf_txflowblock(struct device *dev, bool state); + void brcmf_txflowblock(struct device *dev, bool state); /* Notify the bus has transferred the tx packet to firmware */ - extern void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, - bool success); + void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success); - extern int brcmf_bus_start(struct device *dev); + int brcmf_bus_start(struct device *dev); #ifdef CONFIG_BRCMFMAC_SDIO - extern void brcmf_sdio_exit(void); - extern void brcmf_sdio_init(void); - extern void brcmf_sdio_register(void); + void brcmf_sdio_exit(void); + void brcmf_sdio_init(void); ++void brcmf_sdio_register(void); #endif #ifdef CONFIG_BRCMFMAC_USB - extern void brcmf_usb_exit(void); - extern void brcmf_usb_register(void); + void brcmf_usb_exit(void); -void brcmf_usb_init(void); ++void brcmf_usb_register(void); #endif #endif /* _BRCMF_BUS_H_ */ diff --cc include/net/secure_seq.h index c2e542b,52c1a90..f257486 --- a/include/net/secure_seq.h +++ b/include/net/secure_seq.h @@@ -3,18 -3,19 +3,18 @@@ #include <linux/types.h> - extern __u32 secure_ip_id(__be32 daddr); - extern __u32 secure_ipv6_id(const __be32 daddr[4]); - extern u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport); - extern u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr, - __be16 dport); - extern __u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr, - __be16 sport, __be16 dport); - extern __u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr, - __be16 sport, __be16 dport); - extern u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr, - __be16 sport, __be16 dport); - extern u64 secure_dccpv6_sequence_number(__be32 *saddr, __be32 *daddr, - __be16 sport, __be16 dport); -void net_secret_init(void); + __u32 secure_ip_id(__be32 daddr); + __u32 secure_ipv6_id(const __be32 daddr[4]); + u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport); + u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr, + __be16 dport); + __u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr, + __be16 sport, __be16 dport); + __u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr, + __be16 sport, __be16 dport); + u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr, + __be16 sport, __be16 dport); + u64 secure_dccpv6_sequence_number(__be32 *saddr, __be32 *daddr, + __be16 sport, __be16 dport); #endif /* _NET_SECURE_SEQ */ -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists