summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/i2c.h3
-rw-r--r--include/linux/ide.h5
-rw-r--r--include/linux/in6.h4
-rw-r--r--include/linux/ip.h10
-rw-r--r--include/linux/ipv6.h1
-rw-r--r--include/linux/netdevice.h10
-rw-r--r--include/linux/netfilter_ipv6/ip6_tables.h3
-rw-r--r--include/linux/rtc.h3
-rw-r--r--include/linux/serialP.h2
-rw-r--r--include/linux/skbuff.h2
-rw-r--r--include/linux/tcp.h1
11 files changed, 27 insertions, 17 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index a8f482b94ba4..0ae665586de1 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -143,7 +143,10 @@ struct i2c_driver {
* with the device.
*/
int (*command)(struct i2c_client *client,unsigned int cmd, void *arg);
+
+ struct device_driver driver;
};
+#define to_i2c_driver(d) container_of(d, struct i2c_driver, driver)
extern struct bus_type i2c_bus_type;
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 7510ad7d1aa4..fb6473237d52 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -341,10 +341,7 @@ void ide_setup_ports( hw_regs_t *hw,
#include <asm/ide.h>
/* Currently only m68k, apus and m8xx need it */
-#ifdef IDE_ARCH_ACK_INTR
-extern int ide_irq_lock;
-# define ide_ack_intr(hwif) (hwif->hw.ack_intr ? hwif->hw.ack_intr(hwif) : 1)
-#else
+#ifndef IDE_ARCH_ACK_INTR
# define ide_ack_intr(hwif) (1)
#endif
diff --git a/include/linux/in6.h b/include/linux/in6.h
index ee7e68e39d9e..051db67aee69 100644
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -65,6 +65,8 @@ struct ipv6_mreq {
int ipv6mr_ifindex;
};
+#define ipv6mr_acaddr ipv6mr_multiaddr
+
struct in6_flowlabel_req
{
struct in6_addr flr_dst;
@@ -166,6 +168,8 @@ struct in6_flowlabel_req
#define IPV6_MTU 24
#define IPV6_RECVERR 25
#define IPV6_V6ONLY 26
+#define IPV6_JOIN_ANYCAST 27
+#define IPV6_LEAVE_ANYCAST 28
/* IPV6_MTU_DISCOVER values */
#define IPV6_PMTUDISC_DONT 0
diff --git a/include/linux/ip.h b/include/linux/ip.h
index f655ce138e78..1c26df3103a8 100644
--- a/include/linux/ip.h
+++ b/include/linux/ip.h
@@ -18,8 +18,6 @@
#define _LINUX_IP_H
#include <asm/byteorder.h>
-/* SOL_IP socket options */
-
#define IPTOS_TOS_MASK 0x1E
#define IPTOS_TOS(tos) ((tos)&IPTOS_TOS_MASK)
#define IPTOS_LOWDELAY 0x10
@@ -67,14 +65,6 @@
#define MAXTTL 255
#define IPDEFTTL 64
-/* struct timestamp, struct route and MAX_ROUTES are removed.
-
- REASONS: it is clear that nobody used them because:
- - MAX_ROUTES value was wrong.
- - "struct route" was wrong.
- - "struct timestamp" had fatally misaligned bitfields and was completely unusable.
- */
-
#define IPOPT_OPTVAL 0
#define IPOPT_OLEN 1
#define IPOPT_OFFSET 2
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 516bb7d6b447..647c40c96452 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -172,6 +172,7 @@ struct ipv6_pinfo {
ipv6only:1;
struct ipv6_mc_socklist *ipv6_mc_list;
+ struct ipv6_ac_socklist *ipv6_ac_list;
struct ipv6_fl_socklist *ipv6_fl_list;
__u32 dst_cookie;
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 20d73363c079..d1f308ccb7c1 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -90,6 +90,11 @@ struct vlan_group;
#define MAX_HEADER (LL_MAX_HEADER + 48)
#endif
+/* Reserve 16byte aligned hard_header_len, but at least 16.
+ * Alternative is: dev->hard_header_len ? (dev->hard_header_len + 15)&~15 : 0
+ */
+#define LL_RESERVED_SPACE(dev) (((dev)->hard_header_len&~15) + 16)
+
/*
* Network device statistics. Akin to the 2.0 ether stats but
* with byte counters.
@@ -360,7 +365,6 @@ struct net_device
#define NETIF_F_IP_CSUM 2 /* Can checksum only TCP/UDP over IPv4. */
#define NETIF_F_NO_CSUM 4 /* Does not require checksum. F.e. loopack. */
#define NETIF_F_HW_CSUM 8 /* Can checksum all the packets. */
-#define NETIF_F_DYNALLOC 16 /* Self-dectructable device. */
#define NETIF_F_HIGHDMA 32 /* Can DMA to high memory. */
#define NETIF_F_FRAGLIST 64 /* Scatter/gather IO. */
#define NETIF_F_HW_VLAN_TX 128 /* Transmit VLAN hw acceleration */
@@ -469,6 +473,10 @@ extern struct net_device *dev_getbyhwaddr(unsigned short type, char *hwaddr);
extern void dev_add_pack(struct packet_type *pt);
extern void dev_remove_pack(struct packet_type *pt);
extern int dev_get(const char *name);
+extern struct net_device *dev_get_by_flags(unsigned short flags,
+ unsigned short mask);
+extern struct net_device *__dev_get_by_flags(unsigned short flags,
+ unsigned short mask);
extern struct net_device *dev_get_by_name(const char *name);
extern struct net_device *__dev_get_by_name(const char *name);
extern struct net_device *dev_alloc(const char *name, int *err);
diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h
index 99ad017569c7..3b6ac2013540 100644
--- a/include/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/linux/netfilter_ipv6/ip6_tables.h
@@ -449,6 +449,9 @@ extern unsigned int ip6t_do_table(struct sk_buff **pskb,
struct ip6t_table *table,
void *userdata);
+/* Check for an extension */
+extern int ip6t_ext_hdr(u8 nexthdr);
+
#define IP6T_ALIGN(s) (((s) + (__alignof__(struct ip6t_entry)-1)) & ~(__alignof__(struct ip6t_entry)-1))
#endif /*__KERNEL__*/
diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index 0711d71bc858..27c38b240736 100644
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -63,7 +63,7 @@ struct rtc_pll_info {
};
/*
- * ioctl calls that are permitted to the /dev/rtc interface, if
+ * ioctl calls that are permitted to the /dev/rtc interface, if
* any of the RTC drivers are enabled.
*/
@@ -87,6 +87,7 @@ struct rtc_pll_info {
#define RTC_WKALM_SET _IOW('p', 0x0f, struct rtc_wkalrm)/* Set wakeup alarm*/
#define RTC_WKALM_RD _IOR('p', 0x10, struct rtc_wkalrm)/* Get wakeup alarm*/
+
#define RTC_PLL_GET _IOR('p', 0x11, struct rtc_pll_info) /* Get PLL correction */
#define RTC_PLL_SET _IOW('p', 0x12, struct rtc_pll_info) /* Set PLL correction */
diff --git a/include/linux/serialP.h b/include/linux/serialP.h
index 73541f600528..eb81e4e9b181 100644
--- a/include/linux/serialP.h
+++ b/include/linux/serialP.h
@@ -22,6 +22,7 @@
#include <linux/config.h>
#include <linux/termios.h>
#include <linux/workqueue.h>
+#include <linux/interrupt.h>
#include <linux/circ_buf.h>
#include <linux/wait.h>
#if (LINUX_VERSION_CODE < 0x020300)
@@ -87,6 +88,7 @@ struct async_struct {
u16 iomem_reg_shift;
int io_type;
struct work_struct work;
+ struct tasklet_struct tlet;
#ifdef DECLARE_WAITQUEUE
wait_queue_head_t open_wait;
wait_queue_head_t close_wait;
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 437935a2cfb3..eeb6322193d7 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -226,7 +226,7 @@ struct sk_buff {
unsigned int len,
data_len,
csum;
- unsigned char __unused,
+ unsigned char local_df,
cloned,
pkt_type,
ip_summed;
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 3e43be408a06..da4be9ce631d 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -245,6 +245,7 @@ struct tcp_opt {
__u16 mss_cache_std; /* Like mss_cache, but without TSO */
__u16 mss_clamp; /* Maximal mss, negotiated at connection setup */
__u16 ext_header_len; /* Network protocol overhead (IP/IPv6 options) */
+ __u16 ext2_header_len;/* Options depending on route */
__u8 ca_state; /* State of fast-retransmit machine */
__u8 retransmits; /* Number of unrecovered RTO timeouts. */
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-08 09:26:12 +0000