Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

[pandora-kernel.git] / include / linux / llc.h

diff --git a/include/linux/llc.h b/include/linux/llc.h
index 7733585..ad7074b 100644 (file)
--- a/include/linux/llc.h
+++ b/include/linux/llc.h
@@ -36,6 +36,7 @@ enum llc_sockopts {
        LLC_OPT_BUSY_TMR_EXP,   /* busy state expire time (secs). */
        LLC_OPT_TX_WIN,         /* tx window size. */
        LLC_OPT_RX_WIN,         /* rx window size. */
+       LLC_OPT_PKTINFO,        /* ancillary packet information. */
        LLC_OPT_MAX
 };
 
@@ -70,6 +71,12 @@ enum llc_sockopts {
 #define LLC_SAP_RM     0xD4            /* Resource Management          */
 #define LLC_SAP_GLOBAL 0xFF            /* Global SAP.                  */
 
+struct llc_pktinfo {
+       int lpi_ifindex;
+       unsigned char lpi_sap;
+       unsigned char lpi_mac[IFHWADDRLEN];
+};
+
 #ifdef __KERNEL__
 #define LLC_SAP_DYN_START      0xC0
 #define LLC_SAP_DYN_STOP       0xDE